Skip to content

E
edx-platform
Commit 619ac100 by Brian Wilson
Options

Merge remote-tracking branch 'origin/master' into feature/brian/dashboard-manage-mods

parents 5953be74 62ffc246
Showing with 658 additions and 1938 deletions
common/djangoapps/student/models.py
...@@ -36,10 +36,12 @@ file and check it in at the same time as your model changes. To do that, ...@@ -36,10 +36,12 @@ file and check it in at the same time as your model changes. To do that,
3. Add the migration file created in mitx/common/djangoapps/student/migrations/ 3. Add the migration file created in mitx/common/djangoapps/student/migrations/
""" """
from datetime import datetime from datetime import datetime
from hashlib import sha1
import json import json
import logging import logging
import uuid import uuid
from django.conf import settings from django.conf import settings
from django.contrib.auth.models import User from django.contrib.auth.models import User
from django.db import models from django.db import models
...@@ -125,9 +127,9 @@ class UserProfile(models.Model): ...@@ -125,9 +127,9 @@ class UserProfile(models.Model):
self.meta = json.dumps(js) self.meta = json.dumps(js)
class TestCenterUser(models.Model): class TestCenterUser(models.Model):
"""This is our representation of the User for in-person testing, and """This is our representation of the User for in-person testing, and
specifically for Pearson at this point. A few things to note: specifically for Pearson at this point. A few things to note:
* Pearson only supports Latin-1, so we have to make sure that the data we * Pearson only supports Latin-1, so we have to make sure that the data we
capture here will work with that encoding. capture here will work with that encoding.
* While we have a lot of this demographic data in UserProfile, it's much * While we have a lot of this demographic data in UserProfile, it's much
...@@ -135,9 +137,9 @@ class TestCenterUser(models.Model): ...@@ -135,9 +137,9 @@ class TestCenterUser(models.Model):
UserProfile, but we'll need to have a step where people who are signing UserProfile, but we'll need to have a step where people who are signing
up re-enter their demographic data into the fields we specify. up re-enter their demographic data into the fields we specify.
* Users are only created here if they register to take an exam in person. * Users are only created here if they register to take an exam in person.
The field names and lengths are modeled on the conventions and constraints The field names and lengths are modeled on the conventions and constraints
of Pearson's data import system, including oddities such as suffix having of Pearson's data import system, including oddities such as suffix having
a limit of 255 while last_name only gets 50. a limit of 255 while last_name only gets 50.
""" """
# Our own record keeping... # Our own record keeping...
...@@ -148,21 +150,21 @@ class TestCenterUser(models.Model): ...@@ -148,21 +150,21 @@ class TestCenterUser(models.Model):
# and is something Pearson needs to know to manage updates. Unlike # and is something Pearson needs to know to manage updates. Unlike
# updated_at, this will not get incremented when we do a batch data import. # updated_at, this will not get incremented when we do a batch data import.
user_updated_at = models.DateTimeField(db_index=True) user_updated_at = models.DateTimeField(db_index=True)
# Unique ID given to us for this User by the Testing Center. It's null when # Unique ID given to us for this User by the Testing Center. It's null when
# we first create the User entry, and is assigned by Pearson later. # we first create the User entry, and is assigned by Pearson later.
candidate_id = models.IntegerField(null=True, db_index=True) candidate_id = models.IntegerField(null=True, db_index=True)
# Unique ID we assign our user for a the Test Center. # Unique ID we assign our user for a the Test Center.
client_candidate_id = models.CharField(max_length=50, db_index=True) client_candidate_id = models.CharField(max_length=50, db_index=True)
# Name # Name
first_name = models.CharField(max_length=30, db_index=True) first_name = models.CharField(max_length=30, db_index=True)
last_name = models.CharField(max_length=50, db_index=True) last_name = models.CharField(max_length=50, db_index=True)
middle_name = models.CharField(max_length=30, blank=True) middle_name = models.CharField(max_length=30, blank=True)
suffix = models.CharField(max_length=255, blank=True) suffix = models.CharField(max_length=255, blank=True)
salutation = models.CharField(max_length=50, blank=True) salutation = models.CharField(max_length=50, blank=True)
# Address # Address
address_1 = models.CharField(max_length=40) address_1 = models.CharField(max_length=40)
address_2 = models.CharField(max_length=40, blank=True) address_2 = models.CharField(max_length=40, blank=True)
...@@ -175,7 +177,7 @@ class TestCenterUser(models.Model): ...@@ -175,7 +177,7 @@ class TestCenterUser(models.Model):
postal_code = models.CharField(max_length=16, blank=True, db_index=True) postal_code = models.CharField(max_length=16, blank=True, db_index=True)
# country is a ISO 3166-1 alpha-3 country code (e.g. "USA", "CAN", "MNG") # country is a ISO 3166-1 alpha-3 country code (e.g. "USA", "CAN", "MNG")
country = models.CharField(max_length=3, db_index=True) country = models.CharField(max_length=3, db_index=True)
# Phone # Phone
phone = models.CharField(max_length=35) phone = models.CharField(max_length=35)
extension = models.CharField(max_length=8, blank=True, db_index=True) extension = models.CharField(max_length=8, blank=True, db_index=True)
...@@ -183,14 +185,28 @@ class TestCenterUser(models.Model): ...@@ -183,14 +185,28 @@ class TestCenterUser(models.Model):
fax = models.CharField(max_length=35, blank=True) fax = models.CharField(max_length=35, blank=True)
# fax_country_code required *if* fax is present. # fax_country_code required *if* fax is present.
fax_country_code = models.CharField(max_length=3, blank=True) fax_country_code = models.CharField(max_length=3, blank=True)
# Company # Company
company_name = models.CharField(max_length=50, blank=True) company_name = models.CharField(max_length=50, blank=True)
@property @property
def email(self): def email(self):
return self.user.email return self.user.email
def unique_id_for_user(user):
"""
Return a unique id for a user, suitable for inserting into
e.g. personalized survey links.
Currently happens to be implemented as a sha1 hash of the username
(and thus assumes that usernames don't change).
"""
# Using the user id as the salt because it's sort of random, and is already
# in the db.
salt = str(user.id)
return sha1(salt + user.username).hexdigest()
## TODO: Should be renamed to generic UserGroup, and possibly ## TODO: Should be renamed to generic UserGroup, and possibly
# Given an optional field for type of group # Given an optional field for type of group
class UserTestGroup(models.Model): class UserTestGroup(models.Model):
...@@ -363,10 +379,10 @@ def replicate_user_save(sender, **kwargs): ...@@ -363,10 +379,10 @@ def replicate_user_save(sender, **kwargs):
# @receiver(post_save, sender=CourseEnrollment) # @receiver(post_save, sender=CourseEnrollment)
def replicate_enrollment_save(sender, **kwargs): def replicate_enrollment_save(sender, **kwargs):
"""This is called when a Student enrolls in a course. It has to do the """This is called when a Student enrolls in a course. It has to do the
following: following:
1. Make sure the User is copied into the Course DB. It may already exist 1. Make sure the User is copied into the Course DB. It may already exist
(someone deleting and re-adding a course). This has to happen first or (someone deleting and re-adding a course). This has to happen first or
the foreign key constraint breaks. the foreign key constraint breaks.
2. Replicate the CourseEnrollment. 2. Replicate the CourseEnrollment.
...@@ -410,9 +426,9 @@ USER_FIELDS_TO_COPY = ["id", "username", "first_name", "last_name", "email", ...@@ -410,9 +426,9 @@ USER_FIELDS_TO_COPY = ["id", "username", "first_name", "last_name", "email",
def replicate_user(portal_user, course_db_name): def replicate_user(portal_user, course_db_name):
"""Replicate a User to the correct Course DB. This is more complicated than """Replicate a User to the correct Course DB. This is more complicated than
it should be because Askbot extends the auth_user table and adds its own it should be because Askbot extends the auth_user table and adds its own
fields. So we need to only push changes to the standard fields and leave fields. So we need to only push changes to the standard fields and leave
the rest alone so that Askbot changes at the Course DB level don't get the rest alone so that Askbot changes at the Course DB level don't get
overridden. overridden.
""" """
try: try:
...@@ -457,7 +473,7 @@ def is_valid_course_id(course_id): ...@@ -457,7 +473,7 @@ def is_valid_course_id(course_id):
"""Right now, the only database that's not a course database is 'default'. """Right now, the only database that's not a course database is 'default'.
I had nicer checking in here originally -- it would scan the courses that I had nicer checking in here originally -- it would scan the courses that
were in the system and only let you choose that. But it was annoying to run were in the system and only let you choose that. But it was annoying to run
tests with, since we don't have course data for some for our course test tests with, since we don't have course data for some for our course test
databases. Hence the lazy version. databases. Hence the lazy version.
""" """
return course_id != 'default' return course_id != 'default'
......
common/djangoapps/student/tests.py
...@@ -6,11 +6,16 @@ Replace this with more appropriate tests for your application. ...@@ -6,11 +6,16 @@ Replace this with more appropriate tests for your application.
""" """
import logging import logging
from datetime import datetime from datetime import datetime
from hashlib import sha1
from django.test import TestCase from django.test import TestCase
from mock import patch, Mock
from nose.plugins.skip import SkipTest from nose.plugins.skip import SkipTest
from .models import User, UserProfile, CourseEnrollment, replicate_user, USER_FIELDS_TO_COPY from .models import (User, UserProfile, CourseEnrollment,
replicate_user, USER_FIELDS_TO_COPY,
unique_id_for_user)
from .views import process_survey_link, _cert_info
COURSE_1 = 'edX/toy/2012_Fall' COURSE_1 = 'edX/toy/2012_Fall'
COURSE_2 = 'edx/full/6.002_Spring_2012' COURSE_2 = 'edx/full/6.002_Spring_2012'
...@@ -55,7 +60,7 @@ class ReplicationTest(TestCase): ...@@ -55,7 +60,7 @@ class ReplicationTest(TestCase):
# This hasattr lameness is here because we don't want this test to be # This hasattr lameness is here because we don't want this test to be
# triggered when we're being run by CMS tests (Askbot doesn't exist # triggered when we're being run by CMS tests (Askbot doesn't exist
# there, so the test will fail). # there, so the test will fail).
# #
# seen_response_count isn't a field we care about, so it shouldn't have # seen_response_count isn't a field we care about, so it shouldn't have
# been copied over. # been copied over.
if hasattr(portal_user, 'seen_response_count'): if hasattr(portal_user, 'seen_response_count'):
...@@ -74,7 +79,7 @@ class ReplicationTest(TestCase): ...@@ -74,7 +79,7 @@ class ReplicationTest(TestCase):
# During this entire time, the user data should never have made it over # During this entire time, the user data should never have made it over
# to COURSE_2 # to COURSE_2
self.assertRaises(User.DoesNotExist, self.assertRaises(User.DoesNotExist,
User.objects.using(COURSE_2).get, User.objects.using(COURSE_2).get,
id=portal_user.id) id=portal_user.id)
...@@ -108,19 +113,19 @@ class ReplicationTest(TestCase): ...@@ -108,19 +113,19 @@ class ReplicationTest(TestCase):
# Grab all the copies we expect # Grab all the copies we expect
course_user = User.objects.using(COURSE_1).get(id=portal_user.id) course_user = User.objects.using(COURSE_1).get(id=portal_user.id)
self.assertEquals(portal_user, course_user) self.assertEquals(portal_user, course_user)
self.assertRaises(User.DoesNotExist, self.assertRaises(User.DoesNotExist,
User.objects.using(COURSE_2).get, User.objects.using(COURSE_2).get,
id=portal_user.id) id=portal_user.id)
course_enrollment = CourseEnrollment.objects.using(COURSE_1).get(id=portal_enrollment.id) course_enrollment = CourseEnrollment.objects.using(COURSE_1).get(id=portal_enrollment.id)
self.assertEquals(portal_enrollment, course_enrollment) self.assertEquals(portal_enrollment, course_enrollment)
self.assertRaises(CourseEnrollment.DoesNotExist, self.assertRaises(CourseEnrollment.DoesNotExist,
CourseEnrollment.objects.using(COURSE_2).get, CourseEnrollment.objects.using(COURSE_2).get,
id=portal_enrollment.id) id=portal_enrollment.id)
course_user_profile = UserProfile.objects.using(COURSE_1).get(id=portal_user_profile.id) course_user_profile = UserProfile.objects.using(COURSE_1).get(id=portal_user_profile.id)
self.assertEquals(portal_user_profile, course_user_profile) self.assertEquals(portal_user_profile, course_user_profile)
self.assertRaises(UserProfile.DoesNotExist, self.assertRaises(UserProfile.DoesNotExist,
UserProfile.objects.using(COURSE_2).get, UserProfile.objects.using(COURSE_2).get,
id=portal_user_profile.id) id=portal_user_profile.id)
...@@ -174,30 +179,112 @@ class ReplicationTest(TestCase): ...@@ -174,30 +179,112 @@ class ReplicationTest(TestCase):
portal_user.save() portal_user.save()
portal_user_profile.gender = 'm' portal_user_profile.gender = 'm'
portal_user_profile.save() portal_user_profile.save()
# Grab all the copies we expect, and make sure it doesn't end up in # Grab all the copies we expect, and make sure it doesn't end up in
# places we don't expect. # places we don't expect.
course_user = User.objects.using(COURSE_1).get(id=portal_user.id) course_user = User.objects.using(COURSE_1).get(id=portal_user.id)
self.assertEquals(portal_user, course_user) self.assertEquals(portal_user, course_user)
self.assertRaises(User.DoesNotExist, self.assertRaises(User.DoesNotExist,
User.objects.using(COURSE_2).get, User.objects.using(COURSE_2).get,
id=portal_user.id) id=portal_user.id)
course_enrollment = CourseEnrollment.objects.using(COURSE_1).get(id=portal_enrollment.id) course_enrollment = CourseEnrollment.objects.using(COURSE_1).get(id=portal_enrollment.id)
self.assertEquals(portal_enrollment, course_enrollment) self.assertEquals(portal_enrollment, course_enrollment)
self.assertRaises(CourseEnrollment.DoesNotExist, self.assertRaises(CourseEnrollment.DoesNotExist,
CourseEnrollment.objects.using(COURSE_2).get, CourseEnrollment.objects.using(COURSE_2).get,
id=portal_enrollment.id) id=portal_enrollment.id)
course_user_profile = UserProfile.objects.using(COURSE_1).get(id=portal_user_profile.id) course_user_profile = UserProfile.objects.using(COURSE_1).get(id=portal_user_profile.id)
self.assertEquals(portal_user_profile, course_user_profile) self.assertEquals(portal_user_profile, course_user_profile)
self.assertRaises(UserProfile.DoesNotExist, self.assertRaises(UserProfile.DoesNotExist,
UserProfile.objects.using(COURSE_2).get, UserProfile.objects.using(COURSE_2).get,
id=portal_user_profile.id) id=portal_user_profile.id)
class CourseEndingTest(TestCase):
"""Test things related to course endings: certificates, surveys, etc"""
def test_process_survey_link(self):
username = "fred"
user = Mock(username=username)
id = unique_id_for_user(user)
link1 = "http://www.mysurvey.com"
self.assertEqual(process_survey_link(link1, user), link1)
link2 = "http://www.mysurvey.com?unique={UNIQUE_ID}"
link2_expected = "http://www.mysurvey.com?unique={UNIQUE_ID}".format(UNIQUE_ID=id)
self.assertEqual(process_survey_link(link2, user), link2_expected)
def test_cert_info(self):
user = Mock(username="fred")
survey_url = "http://a_survey.com"
course = Mock(end_of_course_survey_url=survey_url)
self.assertEqual(_cert_info(user, course, None),
{'status': 'processing',
'show_disabled_download_button': False,
'show_download_url': False,
'show_survey_button': False,})
cert_status = {'status': 'unavailable'}
self.assertEqual(_cert_info(user, course, cert_status),
{'status': 'processing',
'show_disabled_download_button': False,
'show_download_url': False,
'show_survey_button': False})
cert_status = {'status': 'generating', 'grade': '67'}
self.assertEqual(_cert_info(user, course, cert_status),
{'status': 'generating',
'show_disabled_download_button': True,
'show_download_url': False,
'show_survey_button': True,
'survey_url': survey_url,
'grade': '67'
})
cert_status = {'status': 'regenerating', 'grade': '67'}
self.assertEqual(_cert_info(user, course, cert_status),
{'status': 'generating',
'show_disabled_download_button': True,
'show_download_url': False,
'show_survey_button': True,
'survey_url': survey_url,
'grade': '67'
})
download_url = 'http://s3.edx/cert'
cert_status = {'status': 'downloadable', 'grade': '67',
'download_url': download_url}
self.assertEqual(_cert_info(user, course, cert_status),
{'status': 'ready',
'show_disabled_download_button': False,
'show_download_url': True,
'download_url': download_url,
'show_survey_button': True,
'survey_url': survey_url,
'grade': '67'
})
cert_status = {'status': 'notpassing', 'grade': '67',
'download_url': download_url}
self.assertEqual(_cert_info(user, course, cert_status),
{'status': 'notpassing',
'show_disabled_download_button': False,
'show_download_url': False,
'show_survey_button': True,
'survey_url': survey_url,
'grade': '67'
})
# Test a course that doesn't have a survey specified
course2 = Mock(end_of_course_survey_url=None)
cert_status = {'status': 'notpassing', 'grade': '67',
'download_url': download_url}
self.assertEqual(_cert_info(user, course2, cert_status),
{'status': 'notpassing',
'show_disabled_download_button': False,
'show_download_url': False,
'show_survey_button': False,
'grade': '67'
})
common/djangoapps/student/views.py
...@@ -28,7 +28,7 @@ from django.core.cache import cache ...@@ -28,7 +28,7 @@ from django.core.cache import cache
from django_future.csrf import ensure_csrf_cookie, csrf_exempt from django_future.csrf import ensure_csrf_cookie, csrf_exempt
from student.models import (Registration, UserProfile, from student.models import (Registration, UserProfile,
PendingNameChange, PendingEmailChange, PendingNameChange, PendingEmailChange,
CourseEnrollment) CourseEnrollment, unique_id_for_user)
from certificates.models import CertificateStatuses, certificate_status_for_student from certificates.models import CertificateStatuses, certificate_status_for_student
...@@ -39,6 +39,7 @@ from xmodule.modulestore.exceptions import ItemNotFoundError ...@@ -39,6 +39,7 @@ from xmodule.modulestore.exceptions import ItemNotFoundError
from datetime import date from datetime import date
from collections import namedtuple from collections import namedtuple
from courseware.courses import get_courses_by_university from courseware.courses import get_courses_by_university
from courseware.access import has_access from courseware.access import has_access
...@@ -68,20 +69,6 @@ def index(request, extra_context={}, user=None): ...@@ -68,20 +69,6 @@ def index(request, extra_context={}, user=None):
extra_context is used to allow immediate display of certain modal windows, eg signup, extra_context is used to allow immediate display of certain modal windows, eg signup,
as used by external_auth. as used by external_auth.
''' '''
feed_data = cache.get("students_index_rss_feed_data")
if feed_data == None:
if hasattr(settings, 'RSS_URL'):
feed_data = urllib.urlopen(settings.RSS_URL).read()
else:
feed_data = render_to_string("feed.rss", None)
cache.set("students_index_rss_feed_data", feed_data, settings.RSS_TIMEOUT)
feed = feedparser.parse(feed_data)
entries = feed['entries'][0:3]
for entry in entries:
soup = BeautifulSoup(entry.description)
entry.image = soup.img['src'] if soup.img else None
entry.summary = soup.getText()
# The course selection work is done in courseware.courses. # The course selection work is done in courseware.courses.
domain = settings.MITX_FEATURES.get('FORCE_UNIVERSITY_DOMAIN') # normally False domain = settings.MITX_FEATURES.get('FORCE_UNIVERSITY_DOMAIN') # normally False
...@@ -89,7 +76,11 @@ def index(request, extra_context={}, user=None): ...@@ -89,7 +76,11 @@ def index(request, extra_context={}, user=None):
domain = request.META.get('HTTP_HOST') domain = request.META.get('HTTP_HOST')
universities = get_courses_by_university(None, universities = get_courses_by_university(None,
domain=domain) domain=domain)
context = {'universities': universities, 'entries': entries}
# Get the 3 most recent news
top_news = _get_news(top=3)
context = {'universities': universities, 'news': top_news}
context.update(extra_context) context.update(extra_context)
return render_to_response('index.html', context) return render_to_response('index.html', context)
...@@ -107,9 +98,9 @@ def get_date_for_press(publish_date): ...@@ -107,9 +98,9 @@ def get_date_for_press(publish_date):
# strip off extra months, and just use the first: # strip off extra months, and just use the first:
date = re.sub(multimonth_pattern, ", ", publish_date) date = re.sub(multimonth_pattern, ", ", publish_date)
if re.search(day_pattern, date): if re.search(day_pattern, date):
date = datetime.datetime.strptime(date, "%B %d, %Y") date = datetime.datetime.strptime(date, "%B %d, %Y")
else: else:
date = datetime.datetime.strptime(date, "%B, %Y") date = datetime.datetime.strptime(date, "%B, %Y")
return date return date
def press(request): def press(request):
...@@ -127,6 +118,87 @@ def press(request): ...@@ -127,6 +118,87 @@ def press(request):
return render_to_response('static_templates/press.html', {'articles': articles}) return render_to_response('static_templates/press.html', {'articles': articles})
def process_survey_link(survey_link, user):
"""
If {UNIQUE_ID} appears in the link, replace it with a unique id for the user.
Currently, this is sha1(user.username). Otherwise, return survey_link.
"""
return survey_link.format(UNIQUE_ID=unique_id_for_user(user))
def cert_info(user, course):
"""
Get the certificate info needed to render the dashboard section for the given
student and course. Returns a dictionary with keys:
'status': one of 'generating', 'ready', 'notpassing', 'processing'
'show_download_url': bool
'download_url': url, only present if show_download_url is True
'show_disabled_download_button': bool -- true if state is 'generating'
'show_survey_button': bool
'survey_url': url, only if show_survey_button is True
'grade': if status is not 'processing'
"""
if not course.has_ended():
return {}
return _cert_info(user, course, certificate_status_for_student(user, course.id))
def _cert_info(user, course, cert_status):
"""
Implements the logic for cert_info -- split out for testing.
"""
default_status = 'processing'
default_info = {'status': default_status,
'show_disabled_download_button': False,
'show_download_url': False,
'show_survey_button': False}
if cert_status is None:
return default_info
# simplify the status for the template using this lookup table
template_state = {
CertificateStatuses.generating: 'generating',
CertificateStatuses.regenerating: 'generating',
CertificateStatuses.downloadable: 'ready',
CertificateStatuses.notpassing: 'notpassing',
}
status = template_state.get(cert_status['status'], default_status)
d = {'status': status,
'show_download_url': status == 'ready',
'show_disabled_download_button': status == 'generating',}
if (status in ('generating', 'ready', 'notpassing') and
course.end_of_course_survey_url is not None):
d.update({
'show_survey_button': True,
'survey_url': process_survey_link(course.end_of_course_survey_url, user)})
else:
d['show_survey_button'] = False
if status == 'ready':
if 'download_url' not in cert_status:
log.warning("User %s has a downloadable cert for %s, but no download url",
user.username, course.id)
return default_info
else:
d['download_url'] = cert_status['download_url']
if status in ('generating', 'ready', 'notpassing'):
if 'grade' not in cert_status:
# Note: as of 11/20/2012, we know there are students in this state-- cs169.1x,
# who need to be regraded (we weren't tracking 'notpassing' at first).
# We can add a log.warning here once we think it shouldn't happen.
return default_info
else:
d['grade'] = cert_status['grade']
return d
@login_required @login_required
@ensure_csrf_cookie @ensure_csrf_cookie
def dashboard(request): def dashboard(request):
...@@ -160,12 +232,10 @@ def dashboard(request): ...@@ -160,12 +232,10 @@ def dashboard(request):
show_courseware_links_for = frozenset(course.id for course in courses show_courseware_links_for = frozenset(course.id for course in courses
if has_access(request.user, course, 'load')) if has_access(request.user, course, 'load'))
# TODO: workaround to not have to zip courses and certificates in the template cert_statuses = { course.id: cert_info(request.user, course) for course in courses}
# since before there is a migration to certificates
if settings.MITX_FEATURES.get('CERTIFICATES_ENABLED'): # Get the 3 most recent news
cert_statuses = { course.id: certificate_status_for_student(request.user, course.id) for course in courses} top_news = _get_news(top=3)
else:
cert_statuses = {}
context = {'courses': courses, context = {'courses': courses,
'message': message, 'message': message,
...@@ -173,6 +243,7 @@ def dashboard(request): ...@@ -173,6 +243,7 @@ def dashboard(request):
'errored_courses': errored_courses, 'errored_courses': errored_courses,
'show_courseware_links_for' : show_courseware_links_for, 'show_courseware_links_for' : show_courseware_links_for,
'cert_statuses': cert_statuses, 'cert_statuses': cert_statuses,
'news': top_news,
} }
return render_to_response('dashboard.html', context) return render_to_response('dashboard.html', context)
...@@ -820,3 +891,24 @@ def test_center_login(request): ...@@ -820,3 +891,24 @@ def test_center_login(request):
return redirect('/courses/MITx/6.002x/2012_Fall/courseware/Final_Exam/Final_Exam_Fall_2012/') return redirect('/courses/MITx/6.002x/2012_Fall/courseware/Final_Exam/Final_Exam_Fall_2012/')
else: else:
return HttpResponseForbidden() return HttpResponseForbidden()
def _get_news(top=None):
"Return the n top news items on settings.RSS_URL"
feed_data = cache.get("students_index_rss_feed_data")
if feed_data == None:
if hasattr(settings, 'RSS_URL'):
feed_data = urllib.urlopen(settings.RSS_URL).read()
else:
feed_data = render_to_string("feed.rss", None)
cache.set("students_index_rss_feed_data", feed_data, settings.RSS_TIMEOUT)
feed = feedparser.parse(feed_data)
entries = feed['entries'][0:top] # all entries if top is None
for entry in entries:
soup = BeautifulSoup(entry.description)
entry.image = soup.img['src'] if soup.img else None
entry.summary = soup.getText()
return entries
lms/djangoapps/certificates/management/commands/fix_ungraded_certs.py 0 → 100644
from certificates.models import GeneratedCertificate
from courseware import grades, courses
from django.test.client import RequestFactory
from django.core.management.base import BaseCommand
from optparse import make_option
class Command(BaseCommand):
help = """
Find all students that need to be graded
and grade them.
"""
option_list = BaseCommand.option_list + (
make_option('-n', '--noop',
action='store_true',
dest='noop',
default=False,
help="Print but do not update the GeneratedCertificate table"),
make_option('-c', '--course',
metavar='COURSE_ID',
dest='course',
default=False,
help='Grade ungraded users for this course'),
)
def handle(self, *args, **options):
course_id = options['course']
print "Fetching ungraded students for {0}".format(course_id)
ungraded = GeneratedCertificate.objects.filter(
course_id__exact=course_id).filter(grade__exact='')
course = courses.get_course_by_id(course_id)
factory = RequestFactory()
request = factory.get('/')
for cert in ungraded:
# grade the student
grade = grades.grade(cert.user, request, course)
print "grading {0} - {1}".format(cert.user, grade['percent'])
cert.grade = grade['percent']
if not options['noop']:
cert.save()
lms/djangoapps/certificates/management/commands/gen_cert_report.py
...@@ -70,8 +70,9 @@ class Command(BaseCommand): ...@@ -70,8 +70,9 @@ class Command(BaseCommand):
cert_data[course_id] = {'enrolled': enrolled_students.count()} cert_data[course_id] = {'enrolled': enrolled_students.count()}
cert_data[course_id].update({'unavailable': unavailable_count}) cert_data[course_id].update({'unavailable': unavailable_count})
tallies = GeneratedCertificate.objects.values( tallies = GeneratedCertificate.objects.filter(
'status').annotate(dcount=Count('status')) course_id__exact=course_id).values('status').annotate(
dcount=Count('status'))
cert_data[course_id].update( cert_data[course_id].update(
{status['status']: status['dcount'] {status['status']: status['dcount']
for status in tallies}) for status in tallies})
......
lms/djangoapps/certificates/models.py
...@@ -75,7 +75,9 @@ def certificate_status_for_student(student, course_id): ...@@ -75,7 +75,9 @@ def certificate_status_for_student(student, course_id):
This returns a dictionary with a key for status, and other information. This returns a dictionary with a key for status, and other information.
The status is one of the following: The status is one of the following:
unavailable - A student is not eligible for a certificate. unavailable - No entry for this student--if they are actually in
the course, they probably have not been graded for
certificate generation yet.
generating - A request has been made to generate a certificate, generating - A request has been made to generate a certificate,
but it has not been generated yet. but it has not been generated yet.
regenerating - A request has been made to regenerate a certificate, regenerating - A request has been made to regenerate a certificate,
...@@ -90,7 +92,7 @@ def certificate_status_for_student(student, course_id): ...@@ -90,7 +92,7 @@ def certificate_status_for_student(student, course_id):
"download_url". "download_url".
If the student has been graded, the dictionary also contains their If the student has been graded, the dictionary also contains their
grade for the course. grade for the course with the key "grade".
''' '''
try: try:
......
lms/djangoapps/certificates/queue.py
...@@ -240,7 +240,7 @@ class XQueueCertInterface(object): ...@@ -240,7 +240,7 @@ class XQueueCertInterface(object):
cert.save() cert.save()
else: else:
cert_status = status.notpassing cert_status = status.notpassing
cert.grade = grade['percent']
cert.status = cert_status cert.status = cert_status
cert.user = student cert.user = student
cert.course_id = course_id cert.course_id = course_id
......
lms/djangoapps/courseware/tests/tests.py
...@@ -698,7 +698,7 @@ class TestCourseGrader(PageLoader): ...@@ -698,7 +698,7 @@ class TestCourseGrader(PageLoader):
def check_grade_percent(self, percent): def check_grade_percent(self, percent):
grade_summary = self.get_grade_summary() grade_summary = self.get_grade_summary()
self.assertEqual(grade_summary['percent'], percent) self.assertEqual(percent, grade_summary['percent'])
def submit_question_answer(self, problem_url_name, responses): def submit_question_answer(self, problem_url_name, responses):
""" """
......
lms/djangoapps/courseware/views.py
import csv
import json
import logging import logging
import urllib import urllib
import itertools
import StringIO
from functools import partial from functools import partial
...@@ -12,7 +8,7 @@ from django.core.context_processors import csrf ...@@ -12,7 +8,7 @@ from django.core.context_processors import csrf
from django.core.urlresolvers import reverse from django.core.urlresolvers import reverse
from django.contrib.auth.models import User from django.contrib.auth.models import User
from django.contrib.auth.decorators import login_required from django.contrib.auth.decorators import login_required
from django.http import Http404, HttpResponse from django.http import Http404
from django.shortcuts import redirect from django.shortcuts import redirect
from mitxmako.shortcuts import render_to_response, render_to_string from mitxmako.shortcuts import render_to_response, render_to_string
#from django.views.decorators.csrf import ensure_csrf_cookie #from django.views.decorators.csrf import ensure_csrf_cookie
...@@ -25,15 +21,11 @@ from courseware.courses import (get_course_with_access, get_courses_by_universit ...@@ -25,15 +21,11 @@ from courseware.courses import (get_course_with_access, get_courses_by_universit
import courseware.tabs as tabs import courseware.tabs as tabs
from courseware.models import StudentModuleCache from courseware.models import StudentModuleCache
from module_render import toc_for_course, get_module, get_instance_module from module_render import toc_for_course, get_module, get_instance_module
from student.models import UserProfile
from multicourse import multicourse_settings
from django_comment_client.utils import get_discussion_title from django_comment_client.utils import get_discussion_title
from student.models import UserTestGroup, CourseEnrollment from student.models import UserTestGroup, CourseEnrollment
from util.cache import cache, cache_if_anonymous from util.cache import cache, cache_if_anonymous
from xmodule.course_module import CourseDescriptor
from xmodule.modulestore import Location from xmodule.modulestore import Location
from xmodule.modulestore.django import modulestore from xmodule.modulestore.django import modulestore
from xmodule.modulestore.exceptions import InvalidLocationError, ItemNotFoundError, NoPathToItem from xmodule.modulestore.exceptions import InvalidLocationError, ItemNotFoundError, NoPathToItem
...@@ -78,7 +70,7 @@ def courses(request): ...@@ -78,7 +70,7 @@ def courses(request):
''' '''
universities = get_courses_by_university(request.user, universities = get_courses_by_university(request.user,
domain=request.META.get('HTTP_HOST')) domain=request.META.get('HTTP_HOST'))
return render_to_response("courses.html", {'universities': universities}) return render_to_response("courseware/courses.html", {'universities': universities})
def render_accordion(request, course, chapter, section): def render_accordion(request, course, chapter, section):
...@@ -97,7 +89,7 @@ def render_accordion(request, course, chapter, section): ...@@ -97,7 +89,7 @@ def render_accordion(request, course, chapter, section):
context = dict([('toc', toc), context = dict([('toc', toc),
('course_id', course.id), ('course_id', course.id),
('csrf', csrf(request)['csrf_token'])] + template_imports.items()) ('csrf', csrf(request)['csrf_token'])] + template_imports.items())
return render_to_string('accordion.html', context) return render_to_string('courseware/accordion.html', context)
def get_current_child(xmodule): def get_current_child(xmodule):
...@@ -407,7 +399,7 @@ def course_about(request, course_id): ...@@ -407,7 +399,7 @@ def course_about(request, course_id):
show_courseware_link = (has_access(request.user, course, 'load') or show_courseware_link = (has_access(request.user, course, 'load') or
settings.MITX_FEATURES.get('ENABLE_LMS_MIGRATION')) settings.MITX_FEATURES.get('ENABLE_LMS_MIGRATION'))
return render_to_response('portal/course_about.html', return render_to_response('courseware/course_about.html',
{'course': course, {'course': course,
'registered': registered, 'registered': registered,
'course_target': course_target, 'course_target': course_target,
...@@ -449,7 +441,7 @@ def render_notifications(request, course, notifications): ...@@ -449,7 +441,7 @@ def render_notifications(request, course, notifications):
'get_discussion_title': partial(get_discussion_title, request=request, course=course), 'get_discussion_title': partial(get_discussion_title, request=request, course=course),
'course': course, 'course': course,
} }
return render_to_string('notifications.html', context) return render_to_string('courseware/notifications.html', context)
@login_required @login_required
def news(request, course_id): def news(request, course_id):
...@@ -462,7 +454,7 @@ def news(request, course_id): ...@@ -462,7 +454,7 @@ def news(request, course_id):
'content': render_notifications(request, course, notifications), 'content': render_notifications(request, course, notifications),
} }
return render_to_response('news.html', context) return render_to_response('courseware/news.html', context)
@login_required @login_required
@cache_control(no_cache=True, no_store=True, must_revalidate=True) @cache_control(no_cache=True, no_store=True, must_revalidate=True)
......
lms/djangoapps/django_comment_client/management/commands/assign_roles_for_course.py 0 → 100644
"""
This must be run only after seed_permissions_roles.py!
Creates default roles for all users in the provided course. Just runs through
Enrollments.
"""
from django.core.management.base import BaseCommand, CommandError
from student.models import CourseEnrollment, assign_default_role
class Command(BaseCommand):
args = 'course_id'
help = 'Add roles for all users in a course'
def handle(self, *args, **options):
if len(args) == 0:
raise CommandError("Please provide a course id")
if len(args) > 1:
raise CommandError("Too many arguments")
course_id = args[0]
print "Updated roles for ",
for i, enrollment in enumerate(CourseEnrollment.objects.filter(course_id=course_id), start=1):
assign_default_role(None, enrollment)
if i % 1000 == 0:
print "{0}...".format(i),
print
lms/static/images/press/releases/mass-edx-gates-launch_3800x2184.jpg.REMOVED.git-id 0 → 100644
6718f0c6e851376b5478baff94e1f1f4449bd938
\ No newline at end of file
lms/static/sass/course.scss
...@@ -46,18 +46,3 @@ ...@@ -46,18 +46,3 @@
// instructor // instructor
@import "course/instructor/instructor"; @import "course/instructor/instructor";
// Askbot / Discussion styles
// TODO: Get rid of askbot-specific styles.
@import "course/discussion/askbot-original";
@import "course/discussion/discussion";
@import "course/discussion/sidebar";
@import "course/discussion/questions";
@import "course/discussion/tags";
@import "course/discussion/question-view" ;
@import "course/discussion/answers";
@import "course/discussion/forms";
@import "course/discussion/form-wmd-toolbar";
@import "course/discussion/modals";
@import "course/discussion/profile";
@import "course/discussion/badges";
lms/static/sass/course/discussion/_answers.scss deleted 100644 → 0
// Styles for individual answers
div.answer-controls {
@include box-sizing(border-box);
display: inline-block;
margin: 0 0 15px;
padding-left: flex-grid(1.1);
width: 100%;
div.answer-count {
display: inline-block;
float: left;
h1 {
margin-bottom: 0;
font-size: em(24);
font-weight: 100;
}
}
div.answer-sort {
float: right;
margin-left: flex-gutter();
nav {
float: right;
margin-top: 10px;
a {
&.on span{
font-weight: bold;
}
&:before {
content: '|';
color: #ccc;
font-size: 16px;
}
}
}
}
}
div.answer-block {
@extend div.question-header;
border-top: #ddd 1px solid;
display: inline-block;
float: left;
padding-top: 20px;
width: 100%;
img.answer-img-accept {
margin: 10px 0px 10px 11px;
}
div.answer-container {
@extend div.question-container;
div.answer-content {
@extend div.question-content;
div.answer-body {
@extend div.question-body;
}
}
}
div.meta-bar {
div.answer-actions {
@extend div.question-actions;
}
}
div.answered-by-owner {
p {
font-style: italic;
color: #656565;
}
div.comments-container {
color: #555;
}
}
div.accepted-answer {
p {
color:#000;
}
}
div.deleted {
p {
color: $pink;
}
}
img.answer-img-accept {
opacity: 0.7;
}
}
div.paginator {
@extend div.answer-block;
text-align: center;
padding: 20px 0;
span {
@include border-radius(3px);
background: #eee;
margin: 0 5px;
padding: 4px 10px;
&.curr {
background: none;
color: $pink;
font-weight: bold;
}
&.next, &.prev {
@extend .light-button;
}
a {
color: #555;
text-decoration: none;
border-bottom: none;
}
}
}
div.answer-own {
border-top: 1px solid #eee;
overflow:hidden;
padding-left: flex-grid(1.2);
padding-top: 10px;
}
div.answer-actions {
margin: 0;
padding:8px 0 8px 8px;
text-align: right;
border-top: 1px solid #efefef;
span.sep {
color: $border-color;
}
a {
cursor: pointer;
text-decoration: none;
@extend a:link;
font-size: em(14);
}
}
lms/static/sass/course/discussion/_badges.scss deleted 100644 → 0
// Style for the user badge list (can be accessed by clicking "View all MIT badges" in the badge section of the Askbot user profile
div.badges-intro {
margin: 20px 0;
}
div.badge-intro {
@extend .badges-intro;
.badge1, .badge2, .badge3 {
font-size: 20px;
}
}
div#award-list{
li.username {
font-size: 20px;
margin-bottom: 8px;
}
}
ul.badge-list {
padding-left: 0;
li.badge {
border-bottom: 1px solid #eee;
@extend .clearfix;
list-style: none;
padding: 10px 0;
&:last-child {
border-bottom: 0;
}
div.check {
float:right;
min-width:flex-grid(1,9);
text-align:right;
span {
font-size:19px;
padding-right:5px;
color:green;
}
}
div.badge-name {
float:left;
width:flex-grid(3,9);
span {
font-size: 20px;
}
}
p {
margin: 0;
float:left;
}
}
}
.gold, .badge1 {
color: #ffcc00;
}
.silver, .badge2 {
color: #cccccc;
}
.bronze, .badge3 {
color: #cc9933;
}
div.discussion-wrapper aside {
div.badge-desc {
border-top: 0;
> div {
margin-bottom: 20px;
span {
font-size: 18px;
@include border-radius(10px);
}
}
}
}
lms/static/sass/course/discussion/_discussion.scss deleted 100644 → 0
// Generic layout styles for the discussion forums
body.askbot {
section.container {
div.discussion-wrapper {
@extend .table-wrapper;
display: table;
div.discussion-content {
@include box-sizing(border-box);
display: table-cell;
min-width: 650px;
padding: 40px;
width: flex-grid(9) + flex-gutter();
a.tabula-rasa, .tabula-rasa{
@extend .light-button;
@include border-radius(5px);
display: block;
margin: 10px auto;
padding: 20px;
text-align: center;
width: flex-grid(5);
text-decoration: none;
color: #888;
font-weight: bold;
&:first-child {
margin-top: 70px;
}
&:last-child {
margin-bottom: 70px;
}
}
}
}
}
}
// Autocomplete
.acInput {
width: 200px;
}
.acResults {
background-color: #fff;
border: 1px solid #ababab;
overflow: hidden;
padding: 0px;
@include box-shadow(0 2px 2px #bbb);
ul {
list-style-position: outside;
list-style: none;
margin: 0;
padding: 0;
width: 100%;
}
li {
cursor: pointer;
display: block;
font: menu;
margin: 0px;
overflow: hidden;
padding: 5px 10px;
text-align: left;
border-top: 1px solid #eee;
width: 100%;
}
}
.acLoading {
background : url('../default/media/images/indicator.gif') right center no-repeat;
}
.acSelect {
background-color: $pink;
color: #fff;
}
lms/static/sass/course/discussion/_form-wmd-toolbar.scss deleted 100644 → 0
// Styles for the WYSIWYG question/answer editor
.wmd-panel
{
}
#wmd-button-bar {
border: 1px solid #ddd;
height:36px;
float:left;
width:99%;
}
#wmd-input {
height: 500px;
background-color: Gainsboro;
border: 1px solid DarkGray;
margin-top: -20px;
}
#wmd-preview {
background-color: LightSkyBlue;
}
#wmd-output {
background-color: Pink;
}
#wmd-button-row {
position: relative;
margin-left: 5px;
margin-right: 5px;
margin-bottom: 0px;
margin-top: 10px;
padding: 0px;
height: 20px;
}
.wmd-spacer {
width: 1px;
height: 20px;
margin-left: 14px;
position: absolute;
background-color: Silver;
display: inline-block;
list-style: none;
}
.wmd-button {
width: 20px;
height: 20px;
margin-left: 5px;
margin-right: 5px;
position: absolute;
background-image: url(../images/askbot/wmd-buttons.png);
background-repeat: no-repeat;
background-position: 0px 0px;
display: inline-block;
list-style: none;
}
.wmd-button > a {
width: 20px;
height: 20px;
margin-left: 5px;
margin-right: 5px;
position: absolute;
display: inline-block;
}
/* sprite button slicing style information */
#wmd-bold-button {left: 0px; background-position: 0px 0;}
#wmd-italic-button {left: 25px; background-position: -20px 0;}
#wmd-spacer1 {left: 50px;}
#wmd-link-button {left: 75px; background-position: -40px 0;}
#wmd-quote-button {left: 100px; background-position: -60px 0;}
#wmd-code-button {left: 125px; background-position: -80px 0;}
#wmd-image-button {left: 150px; background-position: -100px 0;}
#wmd-attachment-button {left: 175px; background-position: -120px 0;}
#wmd-spacer2 {left: 200px;}
#wmd-olist-button {left: 225px; background-position: -140px 0;}
#wmd-ulist-button {left: 250px; background-position: -160px 0;}
#wmd-heading-button {left: 275px; background-position: -180px 0;}
#wmd-hr-button {left: 300px; background-position: -200px 0;}
#wmd-spacer3 {left: 325px;}
#wmd-undo-button {left: 350px; background-position: -220px 0;}
#wmd-redo-button {left: 375px; background-position: -240px 0;}
#wmd-help-button {right: 0px; background-position: -260px 0;}
.wmd-prompt-background
{
background-color: Black;
}
.wmd-prompt-dialog
{
border: 1px solid #999999;
background-color: #F5F5F5;
}
.wmd-prompt-dialog > div {
font-size: 1em;
font-family: arial, helvetica, sans-serif;
}
.wmd-prompt-dialog > form > input[type="text"] {
border: 1px solid #999999;
color: black;
}
.wmd-prompt-dialog > form > input[type="button"]{
border: 1px solid #888888;
font-family: trebuchet MS, helvetica, sans-serif;
font-size: 1em;
font-weight: bold;
}
lms/static/sass/course/discussion/_forms.scss deleted 100644 → 0
// Styles for different forms in the system
form.answer-form {
@include box-sizing(border-box);
border-top: 1px solid #ddd;
overflow: hidden;
padding-left: flex-grid(1.1);
padding-top: lh();
p {
margin-bottom: lh();
}
textarea {
@include box-sizing(border-box);
margin-top: 15px;
resize: vertical;
width: 99%;
&#editor {
min-height: em(120);
}
}
div.checkbox {
margin-bottom: lh();
label {
display: inline;
}
}
div.form-item {
margin: 15px 0;
label {
display: block;
margin-bottom: -5px;
}
.title-desc {
@include box-sizing(border-box);
@include border-radius(4px);
background: #333;
color: #fff;
display: none;
font-size: 13px;
padding: 7px 14px;
-webkit-font-smoothing: antialiased;
}
&:hover {
.title-desc {
display: inline-block;
position: absolute;
margin-left: 10px;
z-index: 1;
width: 200px;
&:before {
border-color: transparent #333 transparent transparent;
border-style:solid;
border-width:12px 12px 12px 0;
content:"";
height:0;
left:-10px;
position:absolute;
top:1;
width:0;
}
}
}
}
span.form-error, label.form-error {
color: #990000;
display: inline-block;
font-size: 90%;
font-weight: bold;
padding: 10px 0;
}
div.preview-toggle{
padding: 15px 0;
width: auto;
a {
@extend .light-button;
}
}
.wmd-preview {
margin: 3px 0 15px 0;
padding: 10px;
background-color: #F5F5F5;
min-height: 20px;
overflow: auto;
font-size: 13px;
font-family: Arial;
p {
margin-bottom: 14px;
line-height: 1.4;
font-size: 14px;
}
blockquote {
margin-left: 2.5%;
padding-left: 1.5%;
border-left: 1px dashed #ddd;
color: $pink;
}
ul, ol, pre {
margin-left: 3%;
margin-bottom: 20px;
}
pre {
background-color: #eee;
}
blockquote {
background-color: #eee;
}
}
}
input.after-editor {
margin-bottom: 20px;
margin-right: 10px;
}
form.question-form {
@extend .answer-form;
border: none;
padding: 15px 0 0 0;
input[type="text"] {
@include box-sizing(border-box);
width: flex-grid(6);
}
input[type="checkbox"] {
margin-top: 10px;
}
input[value="Cancel"] {
@extend .light-button;
float: right;
}
div#question-list {
background-color: rgba(255,255,255,0.95);
@include box-sizing(border-box);
margin-top: -15px;
max-width: 505px;
min-width: 300px;
overflow: hidden;
padding-left: 5px;
position: absolute;
width: 35%;
z-index: 9999;
h2 {
text-transform: none;
padding: 8px 0;
border-bottom: 1px solid #eee;
margin: 0;
span {
background: #eee;
color: #555;
padding: 2px 5px;
@include border-radius(2px);
margin-right: 5px;
}
}
}
}
lms/static/sass/course/discussion/_modals.scss deleted 100644 → 0
// Style for modal boxes that pop up to notify the user of various events
.vote-notification {
background-color: darken(#666, 7%);
@include border-radius(4px);
@include box-shadow(0px 2px 9px #aaa);
color: white;
cursor: pointer;
display: none;
font-size: 14px;
font-weight: normal;
padding-bottom: 10px;
position: absolute;
text-align: center;
z-index: 1;
h3 {
background: #666;
padding: 10px 10px 10px 10px;
font-size: 13px;
margin-bottom: 5px;
border-bottom: darken(#666, 10%) 1px solid;
@include box-shadow(0 1px 0 lighten(#666, 10%));
color: #fff;
font-weight: normal;
@include border-radius(4px 4px 0 0);
}
a {
color: #fb7321;
text-decoration: underline;
font-weight: bold;
}
}
lms/static/sass/course/discussion/_profile.scss deleted 100644 → 0
// Style for the user profile view
body.user-profile-page {
section.questions {
h1 {
margin: 0;
}
}
ul.sub-info {
margin-top: lh();
list-style: none;
padding: 0;
> li {
display: table-cell;
padding: (flex-gutter(9)/2);
border-right: 1px dashed #efefef;
@include box-sizing(border-box);
&:first-child {
padding-left: 0;
}
&:last-child {
border-right: 0;
padding-right: 0;
}
&.votes-badges {
width: flex-grid(2,9);
p {
margin-top: 15px;
}
}
&.answer-list {
width: flex-grid(4, 9);
}
&.tags-list {
width: flex-grid(3,9);
}
h2 {
margin-bottom: 30px;
margin-top: 0;
}
span.tag-number {
display: none;
}
}
ul {
list-style: none;
padding: 0;
&.user-stats-table {
list-style: none;
li {
padding: 10px 0 15px;
border-top: 1px solid #eee;
}
}
&.vote-buttons {
list-style: none;
margin-bottom: 30px;
li {
background-position: 10px -10px;
background-repeat: no-repeat;
display: inline-block;
padding: 2px 10px 2px 40px;
margin-bottom: lh(.5);
border: 1px solid lighten($border-color, 10%);
&.up {
background-image: url(../images/askbot/vote-arrow-up.png);
margin-right: 6px;
}
&.down {
background-image: url(../images/askbot/vote-arrow-down.png);
}
}
}
&.badges {
@include inline-block();
padding: 0;
margin: 0;
a {
background-color: #e3e3e3;
border: 0;
@include border-radius(4px);
color: #292309;
display: block;
font-size: 12px;
padding: 10px;
margin-bottom: 10px;
text-shadow: 0 1px 0 #fff;
text-transform: uppercase;
text-decoration: none;
&:hover {
background-color: #cdcdcd;
}
}
}
}
}
}
lms/static/sass/course/discussion/_question-view.scss deleted 100644 → 0
// Styles for the single question view
div.question-header {
@include clearfix();
div.official-stamp {
background: $pink;
color: #fff;
font-size: 12px;
margin-left: -1px;
margin-top: 10px;
padding: 2px 5px;
text-align: center;
}
div.vote-buttons {
display: inline-block;
float: left;
margin-right: flex-gutter(9);
width: flex-grid(0.7,9);
ul {
padding: 0;
margin: 0;
li {
background-repeat: no-repeat;
color: #999;
font-size: em(20);
font-weight: bold;
list-style: none;
text-align: center;
&.question-img-upvote, &.answer-img-upvote {
background-image: url(../images/askbot/vote-arrow-up.png);
background-position: center 0;
cursor: pointer;
height: 12px;
margin-bottom: lh(.5);
&:hover, &.on {
background-image: url(../images/askbot/vote-arrow-up.png);
background-position: center -22px;
}
}
&.question-img-downvote, &.answer-img-downvote {
cursor: pointer;
background-image: url(../images/askbot/vote-arrow-down.png);
background-position: center 0;
height: 12px;
margin-top: lh(.5);
&:hover, &.on {
background-image: url(../images/askbot/vote-arrow-down.png);
background-position: center -22px;
}
}
}
}
}
div.question-container {
display: inline-block;
float: left;
width: flex-grid(8.3,9);
h1 {
margin-top: 0;
font-weight: 100;
line-height: 1.1em;
a {
font-weight: 100;
line-height: 1.1em;
}
}
div.meta-bar {
border-bottom: 1px solid #eee;
display: block;
margin: lh(.5) 0 lh();
overflow: hidden;
padding: 5px 0 10px;
div.tag-list {
display: inline-block;
float:left;
width: flex-grid(4,8);
margin-right: flex-gutter(8);
}
div.question-actions {
display: inline-block;
float:left;
text-align: right;
width: flex-grid(4,8);
a {
@extend a:link;
cursor: pointer;
}
span.sep {
color: #ccc;
}
}
}
div.question-content {
overflow: hidden;
div.question-body {
display: inline-block;
float: left;
margin-right: flex-gutter(8);
width: flex-grid(6.2,8);
blockquote {
margin-left: 2.5%;
padding-left: 1.5%;
border-left: 1px dashed #ddd;
color: $pink;
}
ul, ol, pre {
margin-left: 6%;
margin-bottom: 20px;
}
}
div.post-update-container {
display: inline-block;
float: left;
width: 20%;
border-left: 1px dashed #ddd;
a {
border-bottom: none;
font-style: normal;
}
div.post-update-info {
@include box-sizing(border-box);
padding: 10px;
margin-bottom: 10px;
&:last-child {
margin-bottom: 0;
}
&.revision {
text-align: center;
// background:lighten($cream, 7%);
a {
color: black;
}
}
div.change-date {
font-size: em(14);
margin-bottom: 2px;
}
div.user-meta {
display: inline-block;
span.username {
font-size: 20px;
margin-right: 5px;
}
span.user-badges {
}
}
}
}
}
div.comments-container {
@include box-sizing(border-box);
display: inline-block;
padding: 0 0 3% 0;
width: 100%;
margin-top: lh(2);
div.comments-content {
border-top: 1px solid lighten($border-color, 10%);
.block {
border-top: 1px solid lighten($border-color, 10%);
padding: 15px;
display: block;
&:first-child {
border-top: 0;
}
&.official {
padding-top: 10px;
span.official-comment {
background: $pink;
color: #fff;
display: block;
font-size: em(12);
margin: 0 0 10px -5%;
padding:2px 5px 2px 5%;
text-align: left;
width:100px;
}
}
}
form.post-comments {
padding: 15px;
button:first-of-type {
@extend .blue-button;
}
button:last-child {
margin-left: 10px;
float: right;
}
}
div.comment {
&:first-child {
border-top: 0;
}
&:last-child {
margin-bottom: 20px;
}
aside.comment-controls {
background: none;
border: none;
@include box-shadow(none);
display: inline-block;
padding:0 2% 0 0;
text-align: center;
width: 5%;
div {
background: none;
opacity: 0.6;
&:hover {
opacity: 1;
}
}
div.comment-votes {
width: 16px;
a.upvote {
background: url(../images/askbot/comment-vote-up.png) no-repeat 2px;
cursor: pointer;
color: green;
display: block;
margin-bottom: 6px;
margin-top: 5px;
overflow: hidden;
text-decoration: none;
text-indent: -9999px;
width: 20px;
}
a.upvoted {
@include border-radius(3px);
background: #D1E3A8;
color: green;
font-weight: bold;
margin-top: 10px;
padding: 2px;
text-indent: 0px;
}
}
hr {
margin: 0;
}
div.comment-delete {
@extend a:link;
cursor: pointer;
}
div.comment-edit {
@include transform(rotate(50deg));
cursor: pointer;
a.edit-icon {
color: #555;
text-decoration: none;
}
}
}
div.comment-body {
display: inline-block;
width: 95%;
&#full-width {
width: 100%;
}
div.comment-meta {
text-align: right;
margin-top: lh(.5);
a.author {
font-weight: bold;
}
a.edit {
padding: 2px 10px;
}
}
}
}
}
#edit-comment-form {
margin: 10px 0;
min-height: 100px;
width: 99%;
resize: vertical;
}
.counter {
color: #888;
display: none;
float: right;
margin-top: 5px;
text-align: right;
}
div.controls {
text-align: right;
a {
display: inline-block;
margin: 10px 10px 10px 0;
}
}
}
}
}
div.question-status {
background: $pink;
clear:both;
color: #fff;
display: block;
padding: 10px 0 10px 7.5%;
h3 {
font-weight: normal;
}
a {
color: #eee;
}
}
div.share-question {
padding: 10px 0 10px 7.5%;
p {
padding: 0;
margin: 0;
}
}
lms/static/sass/course/discussion/_questions.scss deleted 100644 → 0
// Styles for the default question list view
div.question-list-header {
@extend h1.top-header;
display: block;
margin-bottom: 0px;
padding-bottom: lh(.5);
overflow: hidden;
width: flex-grid(9,9);
h1 {
margin: 0;
font-size: 1em;
font-weight: 100;
padding-bottom: lh(.5);
> a.light-button {
float: right;
font-size: em(14, 24);
letter-spacing: 0;
font-weight: 400;
}
}
section.question-list-meta {
display: block;
overflow: hidden;
width: 100%;
div {
display: inline-block;
float: left;
}
h1 {
margin: 0;
}
span.label {
color: #555;
}
div.question-list-title {
margin-right: flex-gutter();
h1 {
margin-top: 0;
}
}
div.question-sort {
float: right;
margin-left: flex-gutter();
margin-top: 6px;
nav {
@extend .action-link;
float: right;
font-size: em(16, 24);
a {
font-size: 1em;
&.on span{
font-weight: bold;
}
&:before {
content: '|';
color: #ccc;
font-size: 16px;
}
}
}
}
}
section.question-tags-list {
display: block;
min-height: 26px;
padding-top:15px;
width: 100%;
div {
display: inline-block;
float: left;
}
div.back {
margin-right: 10px;
margin-top: 4px;
a {
color: #555;
font-size: em(14, 24);
}
}
div.tags-list {
}
ul.tags {
span, div {
line-height: 1em;
margin-left: 6px;
cursor: pointer;
}
}
}
}
ul.question-list, div#question-list {
width: flex-grid(9,9);
padding-left: 0;
margin: 0;
li.single-question {
border-bottom: 1px solid #eee;
list-style: none;
padding: lh() 0;
width: 100%;
&:first-child {
border-top: 0;
}
div {
display: inline-block;
&.question-body {
@include box-sizing(border-box);
margin-right: flex-gutter();
width: flex-grid(5,9);
h2 {
font-size: em(20);
font-weight: bold;
letter-spacing: 0;
margin: 0 0 lh() 0;
text-transform: none;
line-height: lh();
a {
line-height: lh();
}
}
p.excerpt {
color: #777;
}
div.user-info {
display: inline-block;
vertical-align: top;
margin: lh() 0 0 0;
line-height: lh();
span.relative-time {
font-weight: normal;
line-height: lh();
}
}
ul.tags {
display: inline-block;
margin: lh() 0 0 0;
padding: 0;
}
}
&.question-meta {
float: right;
width: flex-grid(3,9);
ul {
@include clearfix;
margin: 0;
padding: 0;
list-style: none;
li {
border: 1px solid lighten($border-color, 10%);
@include box-sizing(border-box);
@include box-shadow(0 1px 0 #fff);
height:60px;
float: left;
margin-right: flex-gutter(3);
width: flex-grid(1,3);
&:last-child {
margin-right: 0px;
}
&:hover {
span, div {
color: #555;
}
}
&.answers {
&.accepted {
border-color: lighten($border-color, 10%);
span, div {
color: darken(#c4dfbe, 35%);
}
}
&.no-answers {
span, div {
color: $pink;
}
}
}
span, div {
@include box-sizing(border-box);
color: #888;
display: block;
text-align: center;
}
span {
font-size: 16px;
font-weight: bold;
height: 35px;
padding-top: 15px;
vertical-align: middle;
}
div {
height: 25px;
font-size: 12px;
}
}
}
}
}
}
div.post-own-question {
padding: 11px;
margin-top: 10px;
color: #888;
text-align: center;
a {
font-weight: bold;
@extend .light-button;
padding: 20px;
display: block;
margin: 10px auto;
text-align: center;
width: flex-grid(5);
}
}
}
.search-result-summary {
}
lms/static/sass/course/discussion/_sidebar.scss deleted 100644 → 0
// Styles for the Askbot sidebar
div.discussion-wrapper aside {
@extend .sidebar;
border-left: 1px solid #ccc;
border-right: 0;
width: flex-grid(3);
border-radius: 0 3px 3px 0;
&:after {
left: -1px;
right: auto;
}
&.main-sidebar {
min-width:200px;
}
h1 {
margin-bottom: 0;
}
h2 {
color: #3C3C3C;
font-size: 1em;
font-style: normal;
font-weight: bold;
margin-bottom: 1em;
&.first {
margin-top: 0px;
}
}
h3 {
border-bottom: 0;
box-shadow: none;
}
div.inputs {
input[type="submit"] {
width: 27%;
float: right;
text-align: center;
padding: 4px 0;
text-transform: capitalize;
}
input[type="text"] {
width: 62%;
}
}
div.box {
display: block;
padding: 18px 26px;
border-top: 1px solid lighten($border-color, 10%);
&:first-child {
border-top: 0;
}
ul#related-tags {
position: relative;
left: -10px;
li {
border-bottom: 0;
background: #ddd;
padding: 6px 10px 6px 5px;
a {
padding: 0;
line-height: 12px;
&:hover {
background: transparent;
}
}
}
}
&.contributors {
a {
@include border-radius(3px);
border: 1px solid #aaa;
cursor: pointer;
display: inline-block;
margin-right: 6px;
position: relative;
&:before {
@include border-radius(3px);
@include box-shadow(inset 0 0 1px 1px rgba(255,255,255,.4));
top: 1px; left: 1px; bottom: 1px; right: 1px;
content: '';
position: absolute;
}
}
}
&.tag-selector {
ul {
margin-bottom: 10px;
display: block;
}
}
}
div.search-box {
margin-top: lh(.5);
input {
@include box-sizing(border-box);
display: inline;
}
input[type='submit'] {
background: url(../images/askbot/search-icon.png) no-repeat center;
border: 0;
@include box-shadow(none);
margin-left: 3px;
opacity: 0.5;
padding: 6px 0 0;
position: absolute;
text-indent: -9999px;
width: 24px;
&:hover {
opacity: 0.9;
}
&:focus {
opacity: 1;
}
}
input#keywords {
padding-left: 30px;
padding-right: 30px;
width: 100%;
}
input#clear {
background: none;
border: none;
@include border-radius(0);
@include box-shadow(none);
color: #999;
display: inline;
font-size: 12px;
font-weight: bold;
height: 19px;
line-height: 1em;
margin: {
left: -25px;
top: 8px;
}
padding: 2px 5px;
text-shadow: none;
}
}
div#tagSelector {
ul {
margin: 0;
}
div.inputs {
margin-bottom: lh();
}
div#displayTagFilterControl {
p.choice {
@include inline-block();
margin-right: lh(.5);
margin-top: 0;
}
}
label {
font-style: normal;
font-weight: 400;
}
}
// Question view specific
div.follow-buttons {
margin-top: 20px;
display: block;
a.button {
@include box-sizing(border-box);
display: block;
text-align: center;
width: 100%;
}
}
div.question-stats {
border-top: 0;
ul {
color: #777;
list-style: none;
li {
padding: 7px 0 0;
border: 0;
&:last-child {
@include box-shadow(none);
border: 0;
}
strong {
float: right;
padding-right: 10px;
}
}
}
}
div.user-info, div.user-stats {
@extend div.question-stats;
overflow: hidden;
div {
float: left;
display: block;
}
div.karma {
border: 1px solid $border-color;
@include box-sizing(border-box);
padding: lh(.4) 0;
text-align: center;
width: flex-grid(1, 3);
float: right;
p {
text-align: center;
strong {
display: block;
font-style: 20px;
}
}
}
div.meta {
width: flex-grid(2,3);
padding-right: flex-gutter(3)*0.5;
@include box-sizing(border-box);
h2 {
border: 0;
@include box-shadow(none);
margin: 0 0 8px 0;
padding: 0;
}
p {
color: #777;
font-size: 14px;
}
}
}
div.user-stats {
overflow: visible;
ul {
h2 {
margin:0 (-(lh())) 5px (-(lh()));
padding: lh(.5) lh();
}
}
}
div.question-tips, div.markdown {
ul,
ol {
margin: 0;
padding: 0;
li {
border-bottom: 0;
line-height: lh();
margin-bottom: em(8);
}
}
}
div.view-profile {
border-top: 0;
padding-top: 0;
a {
@extend .gray-button;
@include box-sizing(border-box);
display: block;
text-align: center;
width: 100%;
margin-top: lh(.5);
&:first-child {
margin-top: 0;
}
span {
font-weight: bold;
}
}
}
}
lms/static/sass/course/discussion/_tags.scss deleted 100644 → 0
// Styles for the question tags
ul.tags {
list-style: none;
display: inline;
padding: 0;
li, a {
position: relative;
}
li {
background: #ddd;
color: #555;
display: inline-block;
font-size: 12px;
margin-bottom: 5px;
margin-left: 15px;
padding: 6px 10px 6px 5px;
&:before {
border-color:transparent #ddd transparent transparent;
border-style:solid;
border-width:12px 10px 12px 0;
content:"";
height:0;
left:-10px;
position:absolute;
top:0;
width:0;
}
a {
color: #555;
text-decoration: none;
border-bottom: none;
font-style: normal;
}
}
}
span.tag-number {
display: none;
}
lms/static/sass/multicourse/_dashboard.scss
...@@ -98,7 +98,7 @@ ...@@ -98,7 +98,7 @@
&.email-icon { &.email-icon {
@include background-image(url('../images/portal-icons/email-icon.png')); @include background-image(url('../images/portal-icons/email-icon.png'));
} }
&.name-icon { &.name-icon {
@include background-image(url('../images/portal-icons/course-info-icon.png')); @include background-image(url('../images/portal-icons/course-info-icon.png'));
} }
...@@ -124,6 +124,103 @@ ...@@ -124,6 +124,103 @@
} }
} }
} }
.news-carousel {
@include clearfix;
margin: 30px 10px 0;
border: 1px solid rgb(200,200,200);
background: rgb(252,252,252);
@include box-shadow(inset 0 0 3px 0 rgba(0,0,0, 0.15));
* {
font-family: $sans-serif;
}
header {
@include clearfix;
height: 50px;
}
.page-dots {
float: right;
margin: 18px 15px 0 0;
li {
float: left;
margin-left: 6px;
}
}
.page-dot {
display: block;
width: 11px;
height: 11px;
border-radius: 11px;
background: $light-gray;
&:hover {
background: #ccc;
}
&.current {
background: $blue;
}
}
h4 {
float: left;
margin-left: 15px;
font-size: 15px;
line-height: 48px;
font-weight: 700;
text-transform: uppercase;
}
.pages {
position: relative;
}
.page {
display: none;
position: absolute;
top: 0;
left: 0;
&:first-child {
display: block;
}
}
section {
padding: 0 10px;
}
.news-image {
height: 180px;
margin-bottom: 15px;
img {
width: 100%;
border: 1px solid $light-gray;
}
}
h5 {
margin-bottom: 8px;
margin-left: 5px;
a {
font-size: 16px;
font-weight: 700;
}
}
.excerpt {
margin-left: 5px;
font-size: 13px;
padding-bottom: 40px;
}
}
} }
.my-courses { .my-courses {
...@@ -325,7 +422,7 @@ ...@@ -325,7 +422,7 @@
p { p {
color: #222; color: #222;
span { span {
font-weight: bold; font-weight: bold;
} }
...@@ -392,7 +489,7 @@ ...@@ -392,7 +489,7 @@
font-family: "Open Sans", Verdana, Geneva, sans-serif; font-family: "Open Sans", Verdana, Geneva, sans-serif;
background: #fffcf0; background: #fffcf0;
border: 1px solid #ccc; border: 1px solid #ccc;
.message-copy { .message-copy {
margin: 0; margin: 0;
......
lms/templates/courses.html → lms/templates/courseware/courses.html
<%inherit file="main.html" /> <%inherit file="../main.html" />
<%namespace name='static' file='static_content.html'/> <%namespace name='static' file='../static_content.html'/>
<%block name="title"><title>Courses</title></%block> <%block name="title"><title>Courses</title></%block>
...@@ -22,17 +22,17 @@ ...@@ -22,17 +22,17 @@
<section class="courses"> <section class="courses">
<section class='university-column'> <section class='university-column'>
%for course in universities['MITx']: %for course in universities['MITx']:
<%include file="course.html" args="course=course" /> <%include file="../course.html" args="course=course" />
%endfor %endfor
</section> </section>
<section class='university-column'> <section class='university-column'>
%for course in universities['HarvardX']: %for course in universities['HarvardX']:
<%include file="course.html" args="course=course" /> <%include file="../course.html" args="course=course" />
%endfor %endfor
</section> </section>
<section class='university-column last'> <section class='university-column last'>
%for course in universities['BerkeleyX']: %for course in universities['BerkeleyX']:
<%include file="course.html" args="course=course" /> <%include file="../course.html" args="course=course" />
%endfor %endfor
</section> </section>
</section> </section>
......
lms/templates/news.html → lms/templates/courseware/news.html
<%inherit file="main.html" /> <%inherit file="main.html" />
<%namespace name='static' file='static_content.html'/> <%namespace name='static' file='../static_content.html'/>
<%block name="bodyclass">courseware news</%block> <%block name="bodyclass">courseware news</%block>
<%block name="title"><title>News – MITx 6.002x</title></%block> <%block name="title"><title>News – MITx 6.002x</title></%block>
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<%block name="js_extra"> <%block name="js_extra">
</%block> </%block>
<%include file="/courseware/course_navigation.html" args="active_page='news'" /> <%include file="course_navigation.html" args="active_page='news'" />
<section class="container"> <section class="container">
<div class="course-wrapper"> <div class="course-wrapper">
......
lms/templates/notifications.html → lms/templates/courseware/notifications.html
...@@ -5,7 +5,7 @@ def url_for_thread(discussion_id, thread_id): ...@@ -5,7 +5,7 @@ def url_for_thread(discussion_id, thread_id):
return reverse('django_comment_client.forum.views.single_thread', args=[course.id, discussion_id, thread_id]) return reverse('django_comment_client.forum.views.single_thread', args=[course.id, discussion_id, thread_id])
%> %>
<% <%
def url_for_comment(discussion_id, thread_id, comment_id): def url_for_comment(discussion_id, thread_id, comment_id):
return url_for_thread(discussion_id, thread_id) + "#" + comment_id return url_for_thread(discussion_id, thread_id) + "#" + comment_id
%> %>
...@@ -15,7 +15,7 @@ def url_for_discussion(discussion_id): ...@@ -15,7 +15,7 @@ def url_for_discussion(discussion_id):
return reverse('django_comment_client.forum.views.forum_form_discussion', args=[course.id, discussion_id]) return reverse('django_comment_client.forum.views.forum_form_discussion', args=[course.id, discussion_id])
%> %>
<% <%
def discussion_title(discussion_id): def discussion_title(discussion_id):
return get_discussion_title(discussion_id=discussion_id) return get_discussion_title(discussion_id=discussion_id)
%> %>
...@@ -59,18 +59,18 @@ def url_for_user(user_id): #TODO ...@@ -59,18 +59,18 @@ def url_for_user(user_id): #TODO
<%def name="render_notification(notification)"> <%def name="render_notification(notification)">
<div class="notification"> <div class="notification">
% if notification['notification_type'] == 'post_reply': % if notification['notification_type'] == 'post_reply':
${render_user_link(notification)} posted a ${render_comment_link(notification)} ${render_user_link(notification)} posted a ${render_comment_link(notification)}
to the thread ${render_thread_link(notification)} in discussion ${render_discussion_link(notification)} to the thread ${render_thread_link(notification)} in discussion ${render_discussion_link(notification)}
% elif notification['notification_type'] == 'post_topic': % elif notification['notification_type'] == 'post_topic':
${render_user_link(notification)} posted a new thread ${render_thread_link(notification)} ${render_user_link(notification)} posted a new thread ${render_thread_link(notification)}
in discussion ${render_discussion_link(notification)} in discussion ${render_discussion_link(notification)}
% elif notification['notification_type'] == 'at_user': % elif notification['notification_type'] == 'at_user':
${render_user(info)} mentioned you in ${render_user(info)} mentioned you in
% if notification['info']['content_type'] == 'thread': % if notification['info']['content_type'] == 'thread':
the thread ${render_thread_link(notification)} the thread ${render_thread_link(notification)}
in discussion ${render_discussion_link(notification)} in discussion ${render_discussion_link(notification)}
% else: % else:
${render_comment_link(notification)} ${render_comment_link(notification)}
to the thread ${render_thread_link(notification)} in discussion ${render_discussion_link(notification)} to the thread ${render_thread_link(notification)} in discussion ${render_discussion_link(notification)}
% endif % endif
% endif % endif
......
lms/templates/dashboard.html
...@@ -14,6 +14,46 @@ ...@@ -14,6 +14,46 @@
<script type="text/javascript"> <script type="text/javascript">
(function() { (function() {
var carouselPageHeight = 0;
var carouselIndex = 0;
var carouselDelay = 5000;
var carouselPages = $('.news-carousel .page').length;
$('.news-carousel .page').each(function() {
carouselPageHeight = Math.max($(this).outerHeight(), carouselPageHeight);
});
$('.news-carousel .pages').css('height', carouselPageHeight);
$('.news-carousel .page-dot').bind('click', setCarouselPage);
var carouselTimer = setInterval(nextCarouselPage, carouselDelay);
function nextCarouselPage() {
carouselIndex = carouselIndex + 1 < carouselPages ? carouselIndex + 1 : 0;
setCarouselPage(null, carouselIndex);
}
function setCarouselPage(event, index) {
var $pageToShow;
var transitionSpeed;
$('.news-carousel .page-dots').find('.current').removeClass('current');
if(event) {
clearInterval(carouselTimer);
carouselTimer = setInterval(nextCarouselPage, carouselDelay);
carouselIndex = $(this).closest('li').index();
transitionSpeed = 250;
$pageToShow = $('.news-carousel .page').eq(carouselIndex);
$(this).addClass('current');
} else {
transitionSpeed = 750;
$pageToShow = $('.news-carousel .page').eq(index);
$('.news-carousel .page-dot').eq(index).addClass('current');
}
$pageToShow.fadeIn(transitionSpeed);
$('.news-carousel .page').not($pageToShow).fadeOut(transitionSpeed);
}
$(".unenroll").click(function(event) { $(".unenroll").click(function(event) {
$("#unenroll_course_id").val( $(event.target).data("course-id") ); $("#unenroll_course_id").val( $(event.target).data("course-id") );
$("#unenroll_course_number").text( $(event.target).data("course-number") ); $("#unenroll_course_number").text( $(event.target).data("course-number") );
...@@ -107,6 +147,39 @@ ...@@ -107,6 +147,39 @@
</li> </li>
</ul> </ul>
</section> </section>
%if news:
<article class="news-carousel">
<header>
<h4>edX News</h4>
<nav class="page-dots">
<ol>
<li><a href="#" class="page-dot current"></a></li>
<li><a href="#" class="page-dot"></a></li>
<li><a href="#" class="page-dot"></a></li>
</ol>
</nav>
</header>
<div class="pages">
% for entry in news:
<section class="page">
%if entry.image:
<div class="news-image">
<a href="${entry.link}"><img src="${entry.image}" /></a>
</div>
%endif
<h5><a href="${entry.link}">${entry.title}</a></h5>
<div class="excerpt">
%if entry.summary:
<p>${entry.summary}</p>
%endif
<p><a href="${entry.link}">Learn More ›</a></p>
</div>
</section>
%endfor
</div>
</article>
%endif
</section> </section>
<section class="my-courses"> <section class="my-courses">
...@@ -159,54 +232,43 @@ ...@@ -159,54 +232,43 @@
%> %>
% if course.has_ended() and cert_status: % if course.has_ended() and cert_status:
<% <%
passing_grade = False if cert_status['status'] == 'generating':
cert_button = False
survey_button = False
if cert_status['status'] in [CertificateStatuses.generating, CertificateStatuses.regenerating]:
status_css_class = 'course-status-certrendering' status_css_class = 'course-status-certrendering'
cert_button = True elif cert_status['status'] == 'ready':
survey_button = True
passing_grade = True
elif cert_status['status'] == CertificateStatuses.downloadable:
status_css_class = 'course-status-certavailable' status_css_class = 'course-status-certavailable'
cert_button = True elif cert_status['status'] == 'notpassing':
survey_button = True
passing_grade = True
elif cert_status['status'] == CertificateStatuses.notpassing:
status_css_class = 'course-status-certnotavailable' status_css_class = 'course-status-certnotavailable'
survey_button = True
else: else:
# This is primarily the 'unavailable' state, but also 'error', 'deleted', etc.
status_css_class = 'course-status-processing' status_css_class = 'course-status-processing'
if survey_button and not course.end_of_course_survey_url:
survey_button = False
%> %>
<div class="message message-status ${status_css_class} is-shown"> <div class="message message-status ${status_css_class} is-shown">
% if cert_status['status'] == CertificateStatuses.unavailable: % if cert_status['status'] == 'processing':
<p class="message-copy">Final course details are being wrapped up at this time. <p class="message-copy">Final course details are being wrapped up at
Your final standing will be available shortly.</p> this time. Your final standing will be available shortly.</p>
% elif passing_grade: % elif cert_status['status'] in ('generating', 'ready'):
<p class="message-copy">You have received a grade of <p class="message-copy">You have received a grade of
<span class="grade-value">${cert_status['grade']}</span> <span class="grade-value">${cert_status['grade']}</span>
in this course.</p> in this course.</p>
% elif cert_status['status'] == CertificateStatuses.notpassing: % elif cert_status['status'] == 'notpassing':
<p class="message-copy">You did not complete the necessary requirements for completion of this course. <p class="message-copy">You did not complete the necessary requirements for
</p> completion of this course.</p>
% endif % endif
% if cert_button or survey_button:
% if cert_status['show_disabled_download_button'] or cert_status['show_download_url'] or cert_status['show_survey_button']:
<ul class="actions"> <ul class="actions">
% if cert_button and cert_status['status'] in [CertificateStatuses.generating, CertificateStatuses.regenerating]: % if cert_status['show_disabled_download_button']:
<li class="action"><span class="btn disabled" href="">Your Certificate is Generating</span></li> <li class="action"><span class="btn disabled" href="">
% elif cert_button and cert_status['status'] == CertificateStatuses.downloadable: Your Certificate is Generating</span></li>
% elif cert_status['show_download_url']:
<li class="action"> <li class="action">
<a class="btn" href="${cert_status['download_url']}" <a class="btn" href="${cert_status['download_url']}"
title="This link will open/download a PDF document"> title="This link will open/download a PDF document">
Download Your PDF Certificate</a></li> Download Your PDF Certificate</a></li>
% endif % endif
% if survey_button:
<li class="action"><a class="cta" href="${course.end_of_course_survey_url}"> % if cert_status['show_survey_button']:
<li class="action"><a class="cta" href="${cert_status['survey_url']}">
Complete our course feedback survey</a></li> Complete our course feedback survey</a></li>
% endif % endif
</ul> </ul>
......
lms/templates/feed.rss
...@@ -8,12 +8,21 @@ ...@@ -8,12 +8,21 @@
<title>EdX Blog</title> <title>EdX Blog</title>
<updated>2012-10-14T14:08:12-07:00</updated> <updated>2012-10-14T14:08:12-07:00</updated>
<entry> <entry>
<id>tag:www.edx.org,2012:Post/7</id>
<published>2012-11-12T14:00:00-07:00</published>
<updated>2012-11-12T14:00:00-07:00</updated>
<link type="text/html" rel="alternate" href="${reverse('press/gates-foundation-announcement')}"/>
<title>edX and Massachusetts Community Colleges join in Gates-Funded educational initiative</title>
<content type="html">&lt;img src=&quot;${static.url('images/press/releases/mass_seal_240x180.png')}&quot; /&gt;
&lt;p&gt;&lt;/p&gt;</content>
</entry>
<entry>
<id>tag:www.edx.org,2012:Post/6</id> <id>tag:www.edx.org,2012:Post/6</id>
<published>2012-10-15T14:00:00-07:00</published> <published>2012-10-15T14:00:00-07:00</published>
<updated>2012-10-14T14:00:00-07:00</updated> <updated>2012-10-14T14:00:00-07:00</updated>
<link type="text/html" rel="alternate" href="${reverse('press/ut-joins-edx')}"/> <link type="text/html" rel="alternate" href="${reverse('press/ut-joins-edx')}"/>
<title>The University of Texas System joins edX</title> <title>The University of Texas System joins edX</title>
<content type="html">&lt;img src=&quot;${static.url('images/press/uts-seal_109x84.jpg')}&quot; /&gt; <content type="html">&lt;img src=&quot;${static.url('images/press/releases/utsys-seal_240x180.png')}&quot; /&gt;
&lt;p&gt;Nine universities and six health institutions&lt;/p&gt;</content> &lt;p&gt;Nine universities and six health institutions&lt;/p&gt;</content>
</entry> </entry>
<!-- <entry> --> <!-- <entry> -->
...@@ -22,7 +31,7 @@ ...@@ -22,7 +31,7 @@
<!-- <updated>2012-09-25T14:00:00-07:00</updated> --> <!-- <updated>2012-09-25T14:00:00-07:00</updated> -->
<!-- <link type="text/html" rel="alternate" href="${reverse('press/elsevier-collaborates-with-edx')}"/> --> <!-- <link type="text/html" rel="alternate" href="${reverse('press/elsevier-collaborates-with-edx')}"/> -->
<!-- <title>Elsevier collaborates with edX</title> --> <!-- <title>Elsevier collaborates with edX</title> -->
<!-- <content type="html">&lt;img src=&quot;${static.url('images/press/foundations-of-analog-109x84.jpg')}&quot; /&gt; --> <!-- <content type="html">&lt;img src=&quot;${static.url('images/press/releases/foundations-of-analog_240x180.jpg')}&quot; /&gt; -->
<!-- &lt;p&gt;Free course textbook made available to edX students&lt;/p&gt;</content> --> <!-- &lt;p&gt;Free course textbook made available to edX students&lt;/p&gt;</content> -->
<!-- </entry> --> <!-- </entry> -->
<entry> <entry>
...@@ -30,8 +39,8 @@ ...@@ -30,8 +39,8 @@
<published>2012-09-06T14:00:00-07:00</published> <published>2012-09-06T14:00:00-07:00</published>
<updated>2012-09-06T14:00:00-07:00</updated> <updated>2012-09-06T14:00:00-07:00</updated>
<link type="text/html" rel="alternate" href="${reverse('press/edX-announces-proctored-exam-testing')}"/> <link type="text/html" rel="alternate" href="${reverse('press/edX-announces-proctored-exam-testing')}"/>
<title>EdX to offer learners option of taking proctored final exam</title> <title>edX to offer learners option of taking proctored final exam</title>
<content type="html">&lt;img src=&quot;${static.url('images/press/diploma-109x84.jpg')}&quot; /&gt;</content> <content type="html">&lt;img src=&quot;${static.url('images/press/releases/diploma_240x180.jpg')}&quot; /&gt;</content>
</entry> </entry>
<entry> <entry>
<id>tag:www.edx.org,2012:Post/3</id> <id>tag:www.edx.org,2012:Post/3</id>
...@@ -39,7 +48,7 @@ ...@@ -39,7 +48,7 @@
<updated>2012-07-16T14:08:12-07:00</updated> <updated>2012-07-16T14:08:12-07:00</updated>
<link type="text/html" rel="alternate" href="${reverse('press/uc-berkeley-joins-edx')}"/> <link type="text/html" rel="alternate" href="${reverse('press/uc-berkeley-joins-edx')}"/>
<title>UC Berkeley joins edX</title> <title>UC Berkeley joins edX</title>
<content type="html">&lt;img src=&quot;${static.url('images/press/edx-109x84.png')}&quot; /&gt; <content type="html">&lt;img src=&quot;${static.url('images/press/releases/edx-logo_240x180.png')}&quot; /&gt;
&lt;p&gt;edX broadens course offerings&lt;/p&gt;</content> &lt;p&gt;edX broadens course offerings&lt;/p&gt;</content>
</entry> </entry>
<entry> <entry>
...@@ -48,7 +57,7 @@ ...@@ -48,7 +57,7 @@
<updated>2012-07-16T14:08:12-07:00</updated> <updated>2012-07-16T14:08:12-07:00</updated>
<link type="text/html" rel="alternate" href="http://edxonline.tumblr.com/post/27589840852/opening-doors-for-exceptional-students-6-002x-in"/> <link type="text/html" rel="alternate" href="http://edxonline.tumblr.com/post/27589840852/opening-doors-for-exceptional-students-6-002x-in"/>
<title>Opening Doors For Exceptional Students: 6.002x in Mongolia</title> <title>Opening Doors For Exceptional Students: 6.002x in Mongolia</title>
<content type="html">&lt;img src=&quot;${static.url('images/press/tumblr_tumbnail_opening_doors_mongolia.jpg')}&quot; /&gt;</content> <content type="html">&lt;img src=&quot;${static.url('images/press/releases/tumblr-mongolia_240x180.jpg')}&quot; /&gt;</content>
</entry> </entry>
<entry> <entry>
<id>tag:www.edx.org,2012:Post/1</id> <id>tag:www.edx.org,2012:Post/1</id>
...@@ -56,6 +65,6 @@ ...@@ -56,6 +65,6 @@
<updated>2012-07-16T14:08:12-07:00</updated> <updated>2012-07-16T14:08:12-07:00</updated>
<link type="text/html" rel="alternate" href="http://edxonline.tumblr.com/post/27589835076/beyond-the-circuits-a-students-experience-with-6-002x"/> <link type="text/html" rel="alternate" href="http://edxonline.tumblr.com/post/27589835076/beyond-the-circuits-a-students-experience-with-6-002x"/>
<title>Brazilian teen blogs about his 6.002x experience</title> <title>Brazilian teen blogs about his 6.002x experience</title>
<content type="html">&lt;img src=&quot;${static.url('images/press/tumblr_tumbnail_brazilian_teen.jpg')}&quot; /&gt;</content> <content type="html">&lt;img src=&quot;${static.url('images/press/releases/tumblr-brazilian-teen_240x180.jpg')}&quot; /&gt;</content>
</entry> </entry>
</feed> </feed>
lms/templates/index.html
...@@ -111,7 +111,7 @@ ...@@ -111,7 +111,7 @@
</header> </header>
<section class="news"> <section class="news">
<section class="blog-posts"> <section class="blog-posts">
%for entry in entries: %for entry in news:
<article> <article>
%if entry.image: %if entry.image:
<a href="${entry.link}" class="post-graphics" target="_blank"><img src="${entry.image}" /></a> <a href="${entry.link}" class="post-graphics" target="_blank"><img src="${entry.image}" /></a>
...@@ -150,7 +150,7 @@ ...@@ -150,7 +150,7 @@
<section id="video-modal" class="modal home-page-video-modal video-modal"> <section id="video-modal" class="modal home-page-video-modal video-modal">
<div class="inner-wrapper"> <div class="inner-wrapper">
<iframe width="640" height="360" src="http://www.youtube.com/embed/C2OQ51tu7W4?showinfo=0" frameborder="0" allowfullscreen></iframe> <iframe width="640" height="360" src="http://www.youtube.com/embed/IlNU60ZKj3I?showinfo=0" frameborder="0" allowfullscreen></iframe>
</div> </div>
</section> </section>
......
lms/templates/static_templates/press_releases/Cengage_to_provide_book_content.html
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
<p>Students who enroll in edX's course <a href="https://www.edx.org/courses/HarvardX/PH207x/2012_Fall/about">PHW207x: Health in Numbers </a>, taught by Professor Marcello Pagano of Harvard's School of Public Health, will have access to an online version of the course textbook, <a href="http://www.cengage.com/search/productOverview.do?Ntt=Principles+of+Biostatistics%7C%7C1294593750742656302174876073224090273&amp;N=16&amp;Ntk=all%7C%7CP_EPI">Principles of Biostatistics, 2nd Edition</a>, written by Marcello Pagano and Kimberlee Gauvreau and published by Cengage Learning. Cengage Learning’s instructional design services will also work with edX to migrate the print pedagogy from the textbook into the on-line course, creating the best scope and sequence for effective student learning.</p> <p>Students who enroll in edX's course <a href="https://www.edx.org/courses/HarvardX/PH207x/2012_Fall/about">PHW207x: Health in Numbers </a>, taught by Professor Marcello Pagano of Harvard's School of Public Health, will have access to an online version of the course textbook, <a href="http://www.cengage.com/search/productOverview.do?Ntt=Principles+of+Biostatistics%7C%7C1294593750742656302174876073224090273&amp;N=16&amp;Ntk=all%7C%7CP_EPI">Principles of Biostatistics, 2nd Edition</a>, written by Marcello Pagano and Kimberlee Gauvreau and published by Cengage Learning. Cengage Learning’s instructional design services will also work with edX to migrate the print pedagogy from the textbook into the on-line course, creating the best scope and sequence for effective student learning.</p>
<figure> <figure>
<img src="${static.url('images/press/cengage_book_327x400.jpg')}" /> <img src="${static.url('images/press/releases/cengage_book_327x400.jpg')}" />
</figure> </figure>
<p>&ldquo;edX students worldwide will benefit from both Professor Pagano's in-class lectures and his classic Cengage Learning textbook in biostatics,&rdquo; said Anant Agarwal, President of edX. &ldquo;We are very grateful for Cengage's commitment to helping edX learners throughout the world.&rdquo;</p> <p>&ldquo;edX students worldwide will benefit from both Professor Pagano's in-class lectures and his classic Cengage Learning textbook in biostatics,&rdquo; said Anant Agarwal, President of edX. &ldquo;We are very grateful for Cengage's commitment to helping edX learners throughout the world.&rdquo;</p>
......
lms/templates/static_templates/press_releases/Elsevier_collaborates_with_edX.html
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
<p>The free version of the textbook was also available in the spring offering of MIT&rsquo;s 6.002x, before the creation of edX.</p> <p>The free version of the textbook was also available in the spring offering of MIT&rsquo;s 6.002x, before the creation of edX.</p>
<figure> <figure>
<img src="${static.url('images/press/elsevier_page_sample_680x660.png')}" /> <img src="${static.url('images/press/releases/elsevier_page_sample_680x660.png')}" />
<figcaption>A page view from the online version of <a href="http://store.elsevier.com/product.jsp?isbn=9781558607354">Foundations of Analog and Digital Electronic Circuits</a> made available to students taking edX&rsquo;s course <a href="https://www.edx.org/courses/MITx/6.002x/2012_Fall/about">6.002X: Circuits and Electronics</a></figcaption> <figcaption>A page view from the online version of <a href="http://store.elsevier.com/product.jsp?isbn=9781558607354">Foundations of Analog and Digital Electronic Circuits</a> made available to students taking edX&rsquo;s course <a href="https://www.edx.org/courses/MITx/6.002x/2012_Fall/about">6.002X: Circuits and Electronics</a></figcaption>
</figure> </figure>
......
lms/templates/static_templates/press_releases/Gates_Foundation_announcement.html 0 → 100644
<%! from django.core.urlresolvers import reverse %>
<%inherit file="../../main.html" />
<%namespace name='static' file='../../static_content.html'/>
<%block name="title"><title>edX and Massachusetts Community Colleges Join in Gates-Funded Educational Initiative</title></%block>
<div id="fb-root"></div>
<script>(function(d, s, id) {
var js, fjs = d.getElementsByTagName(s)[0];
if (d.getElementById(id)) return;
js = d.createElement(s); js.id = id;
js.src = "//connect.facebook.net/en_US/all.js#xfbml=1";
fjs.parentNode.insertBefore(js, fjs);
}(document, 'script', 'facebook-jssdk'));</script>
<section class="pressrelease">
<section class="container">
<h1>edX and Massachusetts Community Colleges Join in Gates-Funded Educational Initiative</h1>
<hr class="horizontal-divider">
<article>
<h2>First Blended MOOC Course slated for Bunker Hill Community College (BHCC) and MassBay Community College</h2>
<figure>
<a href="${static.url('images/press/releases/mass-edx-gates-launch_3800x2184.jpg')}"><img src="${static.url('images/press/releases/mass-edx-gates-launch_300x172.jpg')}" /></a>
<figcaption>
<p>Massachusetts Governor Deval Patrick and other dignitaries speak at a press conference hosted by edX, the world’s leading online-learning initiative founded by Harvard University and MIT, on Monday, November 19. EdX announced the first-of-its-kind community college partnership with Bunker Hill and MassBay Community Colleges, bringing an innovative blended teaching model to their classrooms.</p>
<p>Left to Right: Dr. John O’Donnell, president of MassBay Community College; Richard M. Freeland, Massachusetts Commissioner of Higher Education; Anant Agarwal, president of edX; Governor Deval Patrick; Mary L. Fifield, president of Bunker Hill Community College; Paul Reville, Massachusetts Secretary of Education</p>
<p>Photo by John Mottern / edX<br/>
<a href="${static.url('images/press/releases/mass-edx-gates-launch_3800x2184.jpg')}">High Resolution Image</a></p>
</figcaption>
</figure>
<p><strong>CAMBRIDGE, Mass. &ndash; November 19, 2012 &ndash;</strong>
<a href="https://www.edx.org/">edX</a>, the world’s leading online-learning initiative founded by Harvard University and the Massachusetts Institute of Technology (MIT), today announced an innovative blended massive open online course (MOOC) offering at <a href="http://www.bhcc.mass.edu/" target="_blank">Bunker Hill</a> and <a href="http://www.massbay.edu/" target="_blank">MassBay Community Colleges</a>, the first community colleges to work with edX to bring a new teaching model to the classroom. Through this public/private initiative, community colleges will benefit from edX’s platform, connecting students with leading MOOC professors from around the world.</p>
<p>“Our technology and innovative teaching methods have the potential to transform the way community college students learn, both in and out of the classroom,” said Anant Agarwal, president of edX. “Our work with Bunker Hill and MassBay will enable us to work with other state institutions throughout the country to provide excellent educational opportunities on an ever-tightening budget.”</p>
<p>The collaboration between these two innovative community colleges, both of which have a history of offering online and hybrid courses, and edX was made possible through a $1 million grant from the <a href="http://www.gatesfoundation.org/Pages/home.aspx" target="_blank">Bill and Melinda Gates Foundation</a>. The grant is part of a $9 million investment announced in June 2012 to support breakthrough learning models in postsecondary education. edX, Massachusetts and the Gates Foundation believe that investing in this initiative will pave the way for further innovations in online and on-campus learning for these and other community colleges around the country. </p>
<p>“MOOCs are an exciting innovation. They hold great promise, but are not without challenges– and we are still discovering their full potential,” said Dan Greenstein, Director of Postsecondary Success at the Gates Foundation. “We believe having diverse options for faculty and students that meet a wide array of learning needs and styles can enhance student engagement, improve educational outcomes, and increase college completion rates. We are eager to learn from and share the data that will be generated from these investments in MOOCs.”</p>
<p>“I thank the Bill and Melinda Gates Foundation and edX for understanding the importance of innovative thinking in order to better prepare our students for the jobs of the 21st century global economy,” said Governor Deval Patrick. “A stronger community college system fuels our economy by connecting well-prepared students with employers.”</p>
<p>Beginning in the spring 2013, Bunker Hill and MassBay Community Colleges will offer an adapted version of the <a href="https://www.edx.org/courses/MITx/6.00x/2012_Fall/about">MITx 6.00x Introduction to Computer Science and Programming</a> course at their respective campuses. This unique learning experience will allow students to benefit from virtual courses, enhanced by in-class supporting materials and engaging breakouts. The collaboration aims to build upon edX and community college data-driven research to examine the advantages of a blended classroom model that utilizes edX’s MOOC content, consisting of innovative learning methodologies and game-like educational experiences.</p>
<p>“Community college professors are both teachers and mentors to our students. The blended classroom model allows our professors greater one-to-one contact with our students, allowing for greater course content mastery and application,” stated Dr. John O’Donnell, president of MassBay Community College.</p>
<p>According to BHCC President Mary L. Fifield, “The invitation to participate in edX comes on the heels of several highly successful classroom-based student success initiatives at our College that have increased student persistence by as much as 32 percent. The timing couldn’t be better.”</p>
<p>Through its open source platform, edX enhances teaching and learning by using research on how students learn and transformative technologies that facilitate effective teaching both on-campus and online. EdX’s ultimate goal is to provide access to life-changing knowledge for everyone around the world.</p>
<p>For more information or to sign up for a course, please visit <a href="https://www.edx.org/">www.edx.org</a>.</p>
<h2>About Governor Patrick’s Community College Priorities</h2>
<p>Governor Patrick has prioritized strengthening and unifying the Commonwealth of Massachusetts’ community college system in order to be more responsive to employer needs for skilled workers and help get people back to work. This past summer, the Governor signed legislation that set aside $5 million for community colleges to be used for four main purposes: the development of efficiency measures that may include consolidation of IT platforms and services; the creation of innovative methods for delivering quality higher education that increases capacity, reduces costs and promotes student completion; engaging in statewide and regional collaborations with other public higher education institutions that reduce costs, increase efficiency and promote quality in the areas of academic programming and campus management; and improving student learning outcomes assessments set forth by the Board of Higher Education under the Vision Project.</p>
<h2>About edX</h2>
<p><a href="https://www.edx.org/">edX</a> is a not-for-profit enterprise of its founding partners Harvard University and the Massachusetts Institute of Technology that features learning designed specifically for interactive study via the web. Based on a long history of collaboration and their shared educational missions, the founders are creating a new online-learning experience. Along with offering online courses, the institutions will use edX to research how students learn and how technology can transform learning—both on campus and worldwide. edX is based in Cambridge, Massachusetts.</p>
<section class="contact">
<p><strong>Contact:</strong></p>
<p>Amanda Keane, Weber Shandwick for edX</p>
<p>akeane@webershandwick.com</p>
<p>(617) 520-7260</p>
</section>
<section class="footer">
<hr class="horizontal-divider">
<div class="logo"></div><h3 class="date">11 - 19 - 2012</h3>
<div class="social-sharing">
<hr class="horizontal-divider">
<p>Share with friends and family:</p>
<a href="http://twitter.com/intent/tweet?text=edX+and+Massachusetts+Community+Colleges+Join+in+Gates-Funded+Educational+Initiative:+http://www.edx.org/press/gates-foundation-announcement" class="share">
<img src="${static.url('images/social/twitter-sharing.png')}">
</a>
</a>
<a href="mailto:?subject=edX%20and%20Massachusetts%20Community%20Colleges%20Join%20in%20Gates-Funded%20Educational%20Initiative…http://edx.org/press/gates-foundation-announcement" class="share">
<img src="${static.url('images/social/email-sharing.png')}">
</a>
<div class="fb-like" data-href="http://edx.org/press/gates-foundation-announcement" data-send="true" data-width="450" data-show-faces="true"></div>
</div>
</section>
</article>
</section>
</section>
lms/urls.py
...@@ -101,6 +101,8 @@ urlpatterns = ('', ...@@ -101,6 +101,8 @@ urlpatterns = ('',
{'template': 'press_releases/UT_joins_edX.html'}, name="press/ut-joins-edx"), {'template': 'press_releases/UT_joins_edX.html'}, name="press/ut-joins-edx"),
url(r'^press/cengage-to-provide-book-content$', 'static_template_view.views.render', url(r'^press/cengage-to-provide-book-content$', 'static_template_view.views.render',
{'template': 'press_releases/Cengage_to_provide_book_content.html'}, name="press/cengage-to-provide-book-content"), {'template': 'press_releases/Cengage_to_provide_book_content.html'}, name="press/cengage-to-provide-book-content"),
url(r'^press/gates-foundation-announcement$', 'static_template_view.views.render',
{'template': 'press_releases/Gates_Foundation_announcement.html'}, name="press/gates-foundation-announcement"),
# Should this always update to point to the latest press release? # Should this always update to point to the latest press release?
(r'^pressrelease$', 'django.views.generic.simple.redirect_to', {'url': '/press/uc-berkeley-joins-edx'}), (r'^pressrelease$', 'django.views.generic.simple.redirect_to', {'url': '/press/uc-berkeley-joins-edx'}),
......
rakefile
...@@ -54,7 +54,6 @@ default_options = { ...@@ -54,7 +54,6 @@ default_options = {
task :predjango do task :predjango do
sh("find . -type f -name *.pyc -delete") sh("find . -type f -name *.pyc -delete")
sh('pip install -q --upgrade -r local-requirements.txt') sh('pip install -q --upgrade -r local-requirements.txt')
sh('git submodule update --init')
end end
task :clean_test_files do task :clean_test_files do
......
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