Merge branch 'release'

This commit is contained in:
Don Mitchell
2014-01-17 12:49:15 -05:00

View File

@@ -271,6 +271,12 @@ class StaticTabFields(object):
scope=Scope.content,
help="HTML for the additional pages"
)
# this exists purely to override the default start date
start = Date(
help="placeholder to make sure that Static Tabs are always active",
default=datetime.fromtimestamp(0, UTC),
scope=Scope.settings,
)
class StaticTabModule(StaticTabFields, HtmlModule):
@@ -298,6 +304,12 @@ class CourseInfoFields(object):
default="<ol></ol>",
scope=Scope.content
)
# this exists purely to override the default start date
start = Date(
help="placeholder to make sure that Course Info is always active",
default=datetime.fromtimestamp(0, UTC),
scope=Scope.settings,
)
class CourseInfoModule(CourseInfoFields, HtmlModule):