From 6b4329198f7659d48198049a989a1f39c813f06b Mon Sep 17 00:00:00 2001 From: Kevin McElwee Date: Tue, 1 Dec 2020 12:56:29 -0500 Subject: [PATCH 001/570] Allow django to output dbml --- cdh-web.dbml | 725 ++++++++++++++++++++++++++++++++++++++++++ cdhweb/settings.py | 1 + requirements.lock | 2 + requirements/prod.txt | 1 + 4 files changed, 729 insertions(+) create mode 100644 cdh-web.dbml diff --git a/cdh-web.dbml b/cdh-web.dbml new file mode 100644 index 000000000..75f73c1c0 --- /dev/null +++ b/cdh-web.dbml @@ -0,0 +1,725 @@ +Table auth_user_user_permissions { + user_id auto [pk] + permission_id auto [pk] +} +ref: User.id > auth_user_user_permissions.user_id +ref: Permission.id > auth_user_user_permissions.permission_id +ref: User.id > auth_user_user_permissions.user_id +ref: Permission.id > auth_user_user_permissions.permission_id + + +Table Session { + expire_date date_time [note:""] + session_data text [note:""] + session_key char [pk, unique, note:""] +} + + +Table resources_attachment_pages { + page_id auto [pk] + attachment_id auto [pk] +} +ref: Attachment.id > resources_attachment_pages.attachment_id +ref: Page.id > resources_attachment_pages.page_id + + +Table auth_group_permissions { + permission_id auto [pk] + group_id auto [pk] +} +ref: Group.id > auth_group_permissions.group_id +ref: Permission.id > auth_group_permissions.permission_id + + +Table projects_membership { + person_id auto [pk] + project_id auto [pk] +} +ref: Project.id > projects_membership.project_id +ref: Person.id > projects_membership.person_id + + +Table AssignedKeyword { + content_object None + _order None [null, note:""] + id auto [pk, unique, note:""] + keyword foreign_key [note:""] + object_pk integer [note:""] + content_type foreign_key [note:""] +} +ref: AssignedKeyword.keyword > Keyword.id +ref: AssignedKeyword.content_type > ContentType.id + + +Table projects_project_attachments { + attachment_id auto [pk] + project_id auto [pk] +} +ref: Project.id > projects_project_attachments.project_id +ref: Attachment.id > projects_project_attachments.attachment_id + + +Table Profile { + keywords_string char [note:""] + keywords None [note:""] + status integer [note:"With Draft chosen, will only be shown for admin users on the site."] + site foreign_key [note:""] + title char [note:""] + id auto [pk, unique, note:""] + institution char [note:"Institutional affiliation (for people not associated with Princeton)"] + tagged_items None [note:""] + expiry_date date_time [null, note:"With Published chosen, won't be shown after this time"] + job_title char [note:"Professional title, e.g. Professor or Assistant Professor"] + gen_description boolean [note:"If checked, the description will be automatically generated from content. Uncheck if you want to manually set a custom description."] + user one_to_one [unique, note:""] + office_location char [note:""] + education None [note:""] + department char [note:"Academic Department at Princeton or other institution (optional)"] + image file [null, note:""] + is_staff boolean [note:"CDH staff or Postdoctoral Fellow. If checked, person will be listed on the CDH staff page and will have a profile page on the site."] + created date_time [null, note:""] + _meta_title char [null, note:"Optional title to be used in the HTML title tag. If left blank, the main title field will be used."] + description text [note:""] + thumb file [null, note:""] + in_sitemap boolean [note:""] + publish_date date_time [null, note:"With Published chosen, won't be shown until this time"] + phone_number char [note:""] + pu_status char [note:""] + bio None [note:""] + short_url url [null, note:""] + tags None [null, note:"A comma-separated list of tags."] + updated date_time [null, note:""] + slug char [note:"Leave blank to have the URL auto-generated from the title."] +} +ref: Profile.site > Site.id +ref: Profile.user - Person.id + + +Table people_profile_attachments { + profile_id auto [pk] + attachment_id auto [pk] +} +ref: Profile.id > people_profile_attachments.profile_id +ref: Attachment.id > people_profile_attachments.attachment_id + + +Table ContentType { + id auto [pk, unique, note:""] + model char [note:""] + app_label char [note:""] +} + + +Table UserResource { + id auto [pk, unique, note:""] + user foreign_key [note:""] + url url [note:""] + resource_type foreign_key [note:""] +} +ref: UserResource.resource_type > ResourceType.id +ref: UserResource.user > User.id + + +Table Rating { + content_object None + user foreign_key [null, note:""] + id auto [pk, unique, note:""] + rating_date date_time [null, note:""] + value integer [note:""] + object_pk integer [note:""] + content_type foreign_key [note:""] +} +ref: Rating.content_type > ContentType.id +ref: Rating.user > User.id + + +Table User { + first_name char [note:""] + is_staff boolean [note:"Designates whether the user can log into this admin site."] + is_active boolean [note:"Designates whether this user should be treated as active. Unselect this instead of deleting accounts."] + is_superuser boolean [note:"Designates that this user has all permissions without explicitly assigning them."] + last_name char [note:""] + email email [note:""] + id auto [pk, unique, note:""] + username char [unique, note:"Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only."] + date_joined date_time [note:""] + password char [note:""] + last_login date_time [null, note:""] +} + + +Table Grant { + id auto [pk, unique, note:""] + project foreign_key [note:""] + end_date date [null, note:""] + start_date date [note:""] + grant_type foreign_key [note:""] +} +ref: Grant.project > Project.id +ref: Grant.grant_type > GrantType.id + + +Table blog_blogpost_attachments { + attachment_id auto [pk] + blogpost_id auto [pk] +} +ref: BlogPost.id > blog_blogpost_attachments.blogpost_id +ref: Attachment.id > blog_blogpost_attachments.attachment_id + + +Table blog_blogpost_users { + person_id auto [pk] + blogpost_id auto [pk] +} +ref: BlogPost.id > blog_blogpost_users.blogpost_id +ref: Person.id > blog_blogpost_users.person_id + + +Table Tag { + id auto [pk, unique, note:""] + name char [unique, note:""] + slug slug [unique, note:""] +} + + +Table Site { + id auto [pk, unique, note:""] + name char [note:""] + domain char [unique, note:""] +} + + +Table Group { + id auto [pk, unique, note:""] + name char [unique, note:""] +} + + +Table Position { + id auto [pk, unique, note:""] + user foreign_key [note:""] + end_date date [null, note:""] + start_date date [note:""] + title foreign_key [note:""] +} +ref: Position.user > User.id +ref: Position.title > Title.id + + +Table core_sitepermission_sites { + sitepermission_id auto [pk] + site_id auto [pk] +} +ref: SitePermission.id > core_sitepermission_sites.sitepermission_id +ref: Site.id > core_sitepermission_sites.site_id + + +Table ThreadedComment { + rating_sum integer [note:""] + is_public boolean [note:"Uncheck this box to make the comment effectively disappear from the site."] + by_author boolean [note:""] + site foreign_key [note:""] + id auto [pk, unique, note:""] + object_pk text [note:""] + rating None [note:""] + rating_average float [note:""] + content_type foreign_key [note:""] + comment_ptr one_to_one [pk, unique, note:""] + submit_date date_time [note:""] + user_email email [note:""] + user foreign_key [null, note:""] + user_name char [note:""] + user_url url [note:""] + content_object None + comment text [note:""] + replied_to foreign_key [null, note:""] + ip_address generic_ip_address [null, note:""] + is_removed boolean [note:"Check this box if the comment is inappropriate. A "This comment has been removed" message will be displayed instead."] + rating_count integer [note:""] +} +ref: ThreadedComment.content_type > ContentType.id +ref: ThreadedComment.site > Site.id +ref: ThreadedComment.user > User.id +ref: ThreadedComment.comment_ptr - Comment.id +ref: ThreadedComment.replied_to > ThreadedComment.comment_ptr + + +Table Comment { + is_public boolean [note:"Uncheck this box to make the comment effectively disappear from the site."] + content_object None + site foreign_key [note:""] + id auto [pk, unique, note:""] + object_pk text [note:""] + content_type foreign_key [note:""] + submit_date date_time [note:""] + user_email email [note:""] + user foreign_key [null, note:""] + user_name char [note:""] + user_url url [note:""] + comment text [note:""] + ip_address generic_ip_address [null, note:""] + is_removed boolean [note:"Check this box if the comment is inappropriate. A "This comment has been removed" message will be displayed instead."] +} +ref: Comment.content_type > ContentType.id +ref: Comment.site > Site.id +ref: Comment.user > User.id + + +Table LogEntry { + object_id text [null, note:""] + user foreign_key [note:""] + action_flag positive_small_integer [note:""] + change_message text [note:""] + id auto [pk, unique, note:""] + action_time date_time [note:""] + object_repr char [note:""] + content_type foreign_key [null, note:""] +} +ref: LogEntry.user > User.id +ref: LogEntry.content_type > ContentType.id + + +Table Keyword { + id auto [pk, unique, note:""] + slug char [note:"Leave blank to have the URL auto-generated from the title."] + site foreign_key [note:""] + title char [note:""] +} +ref: Keyword.site > Site.id + + +Table Link { + keywords_string char [note:""] + status integer [note:"With Draft chosen, will only be shown for admin users on the site."] + site foreign_key [note:""] + title char [note:""] + id auto [pk, unique, note:""] + content_model char [null, note:""] + expiry_date date_time [null, note:"With Published chosen, won't be shown after this time"] + keywords None [note:""] + gen_description boolean [note:"If checked, the description will be automatically generated from content. Uncheck if you want to manually set a custom description."] + _order None [null, note:""] + created date_time [null, note:""] + parent foreign_key [null, note:""] + _meta_title char [null, note:"Optional title to be used in the HTML title tag. If left blank, the main title field will be used."] + description text [note:""] + slug char [note:"Leave blank to have the URL auto-generated from the title."] + in_sitemap boolean [note:""] + publish_date date_time [null, note:"With Published chosen, won't be shown until this time"] + page_ptr one_to_one [pk, unique, note:""] + in_menus None [null, note:""] + short_url url [null, note:""] + titles char [null, note:""] + updated date_time [null, note:""] + login_required boolean [note:"If checked, only logged in users can view this page"] +} +ref: Link.site > Site.id +ref: Link.parent > Page.id +ref: Link.page_ptr - Page.id + + +Table Title { + id auto [pk, unique, note:""] + sort_order positive_integer [note:""] + title char [unique, note:""] +} + + +Table events_event_speakers { + event_id auto [pk] + person_id auto [pk] +} +ref: Event.id > events_event_speakers.event_id +ref: Person.id > events_event_speakers.person_id + + +Table Permission { + id auto [pk, unique, note:""] + name char [note:""] + codename char [note:""] + content_type foreign_key [note:""] +} +ref: Permission.content_type > ContentType.id + + +Table Redirect { + id auto [pk, unique, note:""] + new_path char [note:"This can be either an absolute path (as above) or a full URL starting with 'http://'."] + old_path char [note:"This should be an absolute path, excluding the domain name. Example: '/events/search/'."] + site foreign_key [note:""] +} +ref: Redirect.site > Site.id + + +Table events_event_attachments { + event_id auto [pk] + attachment_id auto [pk] +} +ref: Event.id > events_event_attachments.event_id +ref: Attachment.id > events_event_attachments.attachment_id + + +Table RichTextPage { + keywords_string char [note:""] + status integer [note:"With Draft chosen, will only be shown for admin users on the site."] + site foreign_key [note:""] + title char [note:""] + id auto [pk, unique, note:""] + content_model char [null, note:""] + expiry_date date_time [null, note:"With Published chosen, won't be shown after this time"] + keywords None [note:""] + gen_description boolean [note:"If checked, the description will be automatically generated from content. Uncheck if you want to manually set a custom description."] + _order None [null, note:""] + created date_time [null, note:""] + content None [note:""] + parent foreign_key [null, note:""] + _meta_title char [null, note:"Optional title to be used in the HTML title tag. If left blank, the main title field will be used."] + description text [note:""] + slug char [note:"Leave blank to have the URL auto-generated from the title."] + in_sitemap boolean [note:""] + publish_date date_time [null, note:"With Published chosen, won't be shown until this time"] + page_ptr one_to_one [pk, unique, note:""] + in_menus None [null, note:""] + short_url url [null, note:""] + titles char [null, note:""] + updated date_time [null, note:""] + login_required boolean [note:"If checked, only logged in users can view this page"] +} +ref: RichTextPage.site > Site.id +ref: RichTextPage.parent > Page.id +ref: RichTextPage.page_ptr - Page.id + + +Table Event { + keywords_string char [note:""] + status integer [note:"With Draft chosen, will only be shown for admin users on the site."] + location foreign_key [null, note:""] + site foreign_key [note:""] + title char [note:""] + id auto [pk, unique, note:""] + event_type foreign_key [note:""] + join_url url [null, note:"Join URL for virtual events, e.g. Zoom meetings."] + expiry_date date_time [null, note:"With Published chosen, won't be shown after this time"] + keywords None [note:""] + gen_description boolean [note:"If checked, the description will be automatically generated from content. Uncheck if you want to manually set a custom description."] + created date_time [null, note:""] + content None [note:""] + image file [null, note:"Image for display on event detail page (optional)"] + end_time date_time [note:""] + _meta_title char [null, note:"Optional title to be used in the HTML title tag. If left blank, the main title field will be used."] + description text [note:""] + thumb file [null, note:"Image for display on event card (optional)"] + in_sitemap boolean [note:""] + publish_date date_time [null, note:"With Published chosen, won't be shown until this time"] + sponsor char [null, note:""] + start_time date_time [note:""] + tagged_items None [note:""] + short_url url [null, note:""] + tags None [null, note:"A comma-separated list of tags."] + attendance positive_integer [null, note:"Total number of people who attended the event. (Internal only, for reporting purposes.)"] + updated date_time [null, note:""] + slug char [note:"Leave blank to have the URL auto-generated from the title."] +} +ref: Event.site > Site.id +ref: Event.location > Location.id +ref: Event.event_type > EventType.id + + +Table Person { + first_name char [note:""] + is_staff boolean [note:"Designates whether the user can log into this admin site."] + is_active boolean [note:"Designates whether this user should be treated as active. Unselect this instead of deleting accounts."] + is_superuser boolean [note:"Designates that this user has all permissions without explicitly assigning them."] + last_name char [note:""] + email email [note:""] + id auto [pk, unique, note:""] + username char [unique, note:"Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only."] + date_joined date_time [note:""] + password char [note:""] + last_login date_time [null, note:""] +} + + +Table ProjectResource { + id auto [pk, unique, note:""] + project foreign_key [note:""] + url url [note:""] + resource_type foreign_key [note:""] +} +ref: ProjectResource.resource_type > ResourceType.id +ref: ProjectResource.project > Project.id + + +Table blog_blogpost_related_posts { + to_blogpost_id auto [pk] + from_blogpost_id auto [pk] +} +ref: BlogPost.id > blog_blogpost_related_posts.from_blogpost_id +ref: BlogPost.id > blog_blogpost_related_posts.to_blogpost_id + + +Table auth_user_groups { + user_id auto [pk] + group_id auto [pk] +} +ref: User.id > auth_user_groups.user_id +ref: Group.id > auth_user_groups.group_id +ref: User.id > auth_user_groups.user_id +ref: Group.id > auth_user_groups.group_id + + +Table Page { + keywords_string char [note:""] + status integer [note:"With Draft chosen, will only be shown for admin users on the site."] + site foreign_key [note:""] + title char [note:""] + id auto [pk, unique, note:""] + content_model char [null, note:""] + expiry_date date_time [null, note:"With Published chosen, won't be shown after this time"] + keywords None [note:""] + gen_description boolean [note:"If checked, the description will be automatically generated from content. Uncheck if you want to manually set a custom description."] + _order None [null, note:""] + created date_time [null, note:""] + parent foreign_key [null, note:""] + _meta_title char [null, note:"Optional title to be used in the HTML title tag. If left blank, the main title field will be used."] + description text [note:""] + slug char [note:"Leave blank to have the URL auto-generated from the title."] + in_sitemap boolean [note:""] + publish_date date_time [null, note:"With Published chosen, won't be shown until this time"] + in_menus None [null, note:""] + short_url url [null, note:""] + titles char [null, note:""] + updated date_time [null, note:""] + login_required boolean [note:"If checked, only logged in users can view this page"] +} +ref: Page.site > Site.id +ref: Page.parent > Page.id + + +Table SessionTicket { + id auto [pk, unique, note:""] + ticket char [note:""] + session_key char [note:""] +} + + +Table LandingPage { + keywords_string char [note:""] + status integer [note:"With Draft chosen, will only be shown for admin users on the site."] + site foreign_key [note:""] + title char [note:""] + id auto [pk, unique, note:""] + content_model char [null, note:""] + expiry_date date_time [null, note:"With Published chosen, won't be shown after this time"] + keywords None [note:""] + gen_description boolean [note:"If checked, the description will be automatically generated from content. Uncheck if you want to manually set a custom description."] + _order None [null, note:""] + created date_time [null, note:""] + content None [note:""] + parent foreign_key [null, note:""] + tagline char [note:""] + _meta_title char [null, note:"Optional title to be used in the HTML title tag. If left blank, the main title field will be used."] + description text [note:""] + slug char [note:"Leave blank to have the URL auto-generated from the title."] + in_sitemap boolean [note:""] + publish_date date_time [null, note:"With Published chosen, won't be shown until this time"] + page_ptr one_to_one [pk, unique, note:""] + image file [null, note:""] + in_menus None [null, note:""] + short_url url [null, note:""] + titles char [null, note:""] + updated date_time [null, note:""] + login_required boolean [note:"If checked, only logged in users can view this page"] +} +ref: LandingPage.site > Site.id +ref: LandingPage.parent > Page.id +ref: LandingPage.page_ptr - Page.id + + +Table Role { + id auto [pk, unique, note:""] + sort_order positive_integer [note:""] + title char [unique, note:""] +} + + +Table SitePermission { + id auto [pk, unique, note:""] + user one_to_one [unique, note:""] +} +ref: SitePermission.user - User.id + + +Table ResourceType { + id auto [pk, unique, note:""] + name char [note:""] + sort_order positive_integer [note:""] +} + + +Table Attachment { + author char [note:""] + title char [note:""] + id auto [pk, unique, note:""] + attachment_type char [note:""] + url url [note:""] + file file [note:""] +} + + +Table BlogPost { + short_url url [null, note:""] + status integer [note:"With Draft chosen, will only be shown for admin users on the site."] + _meta_title char [null, note:"Optional title to be used in the HTML title tag. If left blank, the main title field will be used."] + site foreign_key [note:""] + title char [note:""] + id auto [pk, unique, note:""] + in_sitemap boolean [note:""] + description text [note:""] + publish_date date_time [null, note:"With Published chosen, won't be shown until this time"] + tagged_items None [note:""] + is_featured boolean [note:"Feature the post in the carousel on the homepage."] + expiry_date date_time [null, note:"With Published chosen, won't be shown after this time"] + keywords None [note:""] + gen_description boolean [note:"If checked, the description will be automatically generated from content. Uncheck if you want to manually set a custom description."] + slug char [note:"Leave blank to have the URL auto-generated from the title."] + featured_image file [null, note:"Appears on the homepage carousel when post is featured."] + created date_time [null, note:""] + content None [note:""] + tags None [null, note:"A comma-separated list of tags."] + updated date_time [null, note:""] + keywords_string char [note:""] +} +ref: BlogPost.site > Site.id + + +Table TaggedItem { + id auto [pk, unique, note:""] + object_id integer [note:""] + tag foreign_key [note:""] + content_object None + content_type foreign_key [note:""] +} +ref: TaggedItem.tag > Tag.id +ref: TaggedItem.content_type > ContentType.id + + +Table Membership { + project foreign_key [note:""] + role foreign_key [note:""] + person foreign_key [note:""] + id auto [pk, unique, note:""] + end_date date [null, note:""] + start_date date [note:""] +} +ref: Membership.project > Project.id +ref: Membership.person > Person.id +ref: Membership.role > Role.id + + +Table GrantType { + id auto [pk, unique, note:""] + grant_type char [unique, note:""] +} + + +Table Location { + id auto [pk, unique, note:""] + address char [null, note:"Address of the location (will not display if same as name)"] + name char [note:"Name of the location"] + is_virtual boolean [note:"Virtual platforms, i.e. Zoom or Google Hangouts"] + short_name char [note:""] +} + + +Table EventType { + id auto [pk, unique, note:""] + name char [unique, note:""] +} + + +Table ProxyGrantingTicket { + user foreign_key [null, note:""] + session_key char [null, note:""] + pgtiou char [null, note:""] + id auto [pk, unique, note:""] + date date_time [note:""] + pgt char [null, note:""] +} +ref: ProxyGrantingTicket.user > User.id + + +Table projects_projectresource { + project_id auto [pk] + resource_type_id auto [pk] +} +ref: Project.id > projects_projectresource.project_id +ref: ResourceType.id > projects_projectresource.resource_type_id + + +Table CommentFlag { + id auto [pk, unique, note:""] + flag char [note:""] + comment foreign_key [note:""] + flag_date date_time [note:""] + user foreign_key [note:""] +} +ref: CommentFlag.user > User.id +ref: CommentFlag.comment > Comment.id + + +Table Project { + keywords_string char [note:""] + status integer [note:"With Draft chosen, will only be shown for admin users on the site."] + site foreign_key [note:""] + title char [note:""] + id auto [pk, unique, note:""] + tagged_items None [note:""] + expiry_date date_time [null, note:"With Published chosen, won't be shown after this time"] + keywords None [note:""] + gen_description boolean [note:"If checked, the description will be automatically generated from content. Uncheck if you want to manually set a custom description."] + long_description None [note:""] + working_group boolean [note:"Project is a long-term collaborative group associated with the CDH."] + created date_time [null, note:""] + _meta_title char [null, note:"Optional title to be used in the HTML title tag. If left blank, the main title field will be used."] + description text [note:""] + thumb file [null, note:""] + slug char [note:"Leave blank to have the URL auto-generated from the title."] + in_sitemap boolean [note:""] + publish_date date_time [null, note:"With Published chosen, won't be shown until this time"] + image file [null, note:""] + short_url url [null, note:""] + tags None [null, note:"A comma-separated list of tags."] + short_description char [note:"Brief tagline for display on project card in browse view"] + cdh_built boolean [note:"Project built by CDH Development & Design team."] + updated date_time [null, note:""] + highlight boolean [note:"Include in randomized project display on the home page."] +} +ref: Project.site > Site.id + + +Table people_position { + user_id auto [pk] + title_id auto [pk] +} +ref: Title.id > people_position.title_id +ref: User.id > people_position.user_id + + +Table Setting { + id auto [pk, unique, note:""] + name char [note:""] + site foreign_key [note:""] + value char [note:""] +} +ref: Setting.site > Site.id + + +Table resources_userresource { + user_id auto [pk] + resource_type_id auto [pk] +} +ref: ResourceType.id > resources_userresource.resource_type_id +ref: User.id > resources_userresource.user_id + + diff --git a/cdhweb/settings.py b/cdhweb/settings.py index 6fb1fdb8b..59a406e1d 100644 --- a/cdhweb/settings.py +++ b/cdhweb/settings.py @@ -322,6 +322,7 @@ "fullurl", "django_cas_ng", "pucas", + "django_dbml", # local apps "cdhweb.projects", "cdhweb.people", diff --git a/requirements.lock b/requirements.lock index 5b720a4ab..91bd53d59 100644 --- a/requirements.lock +++ b/requirements.lock @@ -17,6 +17,7 @@ django-cas-ng==4.1.1 django-compressor==2.4 django-compressor-autoprefixer==0.1.0 django-contrib-comments==1.9.2 +django-dbml==0.3.5 django-debug-toolbar==3.1.1 django-fullurl==1.1 django-taggit==1.3.0 @@ -29,6 +30,7 @@ idna==2.10 imagesize==1.2.0 importlib-metadata==2.0.0 iniconfig==1.1.1 +install==1.3.4 Jinja2==2.11.2 ldap3==2.8.1 lxml==4.6.1 diff --git a/requirements/prod.txt b/requirements/prod.txt index 12aa9e5bd..dc940f8b1 100644 --- a/requirements/prod.txt +++ b/requirements/prod.txt @@ -16,3 +16,4 @@ icalendar attrdict django-fullurl django-apptemplates +django-dbml \ No newline at end of file From c0cb118e2d42da9549836f81114e365e67f4f510 Mon Sep 17 00:00:00 2001 From: Kevin McElwee Date: Tue, 1 Dec 2020 13:00:33 -0500 Subject: [PATCH 002/570] Remove duplicates and quotes to prevent dbdocs syntax errors --- cdh-web.dbml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/cdh-web.dbml b/cdh-web.dbml index 75f73c1c0..66919d826 100644 --- a/cdh-web.dbml +++ b/cdh-web.dbml @@ -4,9 +4,6 @@ Table auth_user_user_permissions { } ref: User.id > auth_user_user_permissions.user_id ref: Permission.id > auth_user_user_permissions.permission_id -ref: User.id > auth_user_user_permissions.user_id -ref: Permission.id > auth_user_user_permissions.permission_id - Table Session { expire_date date_time [note:""] @@ -234,7 +231,7 @@ Table ThreadedComment { comment text [note:""] replied_to foreign_key [null, note:""] ip_address generic_ip_address [null, note:""] - is_removed boolean [note:"Check this box if the comment is inappropriate. A "This comment has been removed" message will be displayed instead."] + is_removed boolean [note:"Check this box if the comment is inappropriate. A *This comment has been removed* message will be displayed instead."] rating_count integer [note:""] } ref: ThreadedComment.content_type > ContentType.id @@ -258,7 +255,7 @@ Table Comment { user_url url [note:""] comment text [note:""] ip_address generic_ip_address [null, note:""] - is_removed boolean [note:"Check this box if the comment is inappropriate. A "This comment has been removed" message will be displayed instead."] + is_removed boolean [note:"Check this box if the comment is inappropriate. A *This comment has been removed* message will be displayed instead."] } ref: Comment.content_type > ContentType.id ref: Comment.site > Site.id @@ -464,8 +461,6 @@ Table auth_user_groups { } ref: User.id > auth_user_groups.user_id ref: Group.id > auth_user_groups.group_id -ref: User.id > auth_user_groups.user_id -ref: Group.id > auth_user_groups.group_id Table Page { From 472a50b3f4a3c63935545fb177868a81277efe4b Mon Sep 17 00:00:00 2001 From: Kevin McElwee Date: Mon, 14 Dec 2020 15:04:13 -0500 Subject: [PATCH 003/570] Add github actions dbdocs draft --- .github/workflows/unit_tests.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml index 8641f1b97..fb4af4dd5 100644 --- a/.github/workflows/unit_tests.yml +++ b/.github/workflows/unit_tests.yml @@ -82,6 +82,17 @@ jobs: run: py.test --cov=./ --cov-report=xml - name: Upload test coverage to Codecov uses: codecov/codecov-action@v1 + + # Build and publish dbdocs + - name: Download dbdocs + run: npm install dbdocs # remove me + - name: Generate DBML + run: python manage.py dbml > cdh-web.dbml + - name: Login to dbdocs + run: echo ${{ secrets.KEVIN_DBDOCS_KEY }} | dbdocs login + - name: Push to dbdocs + run: dbdocs build cdh-web.dbml + # Send a message to slack to report the build status. The webhook is stored # at the organization level and available to all repositories. Only run on # scheduled builds & pushes, since PRs automatically report to Slack. From ea909074b6b88a980c2e9bd4f6fa8ab428f28aca Mon Sep 17 00:00:00 2001 From: Kevin McElwee Date: Mon, 14 Dec 2020 15:05:45 -0500 Subject: [PATCH 004/570] Add project to dbdocs command line --- .github/workflows/unit_tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml index fb4af4dd5..3c08d7b70 100644 --- a/.github/workflows/unit_tests.yml +++ b/.github/workflows/unit_tests.yml @@ -91,7 +91,7 @@ jobs: - name: Login to dbdocs run: echo ${{ secrets.KEVIN_DBDOCS_KEY }} | dbdocs login - name: Push to dbdocs - run: dbdocs build cdh-web.dbml + run: dbdocs build cdh-web.dbml --project cdh-web-gh-actions # Send a message to slack to report the build status. The webhook is stored # at the organization level and available to all repositories. Only run on From 56782403729147e92e1014b801073582f931f4f4 Mon Sep 17 00:00:00 2001 From: Kevin McElwee Date: Mon, 14 Dec 2020 15:08:44 -0500 Subject: [PATCH 005/570] Install dbdocs globally --- .github/workflows/unit_tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml index 3c08d7b70..70b71cf0c 100644 --- a/.github/workflows/unit_tests.yml +++ b/.github/workflows/unit_tests.yml @@ -85,7 +85,7 @@ jobs: # Build and publish dbdocs - name: Download dbdocs - run: npm install dbdocs # remove me + run: npm install -g dbdocs # remove me - name: Generate DBML run: python manage.py dbml > cdh-web.dbml - name: Login to dbdocs From 4b0ea90303f58927a6ef8c471c49f95638bea849 Mon Sep 17 00:00:00 2001 From: Kevin McElwee Date: Mon, 14 Dec 2020 15:30:07 -0500 Subject: [PATCH 006/570] Update dbdocs actions --- .github/workflows/unit_tests.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml index 70b71cf0c..7e4b06ad5 100644 --- a/.github/workflows/unit_tests.yml +++ b/.github/workflows/unit_tests.yml @@ -85,13 +85,13 @@ jobs: # Build and publish dbdocs - name: Download dbdocs - run: npm install -g dbdocs # remove me + run: npm install -g dbdocs - name: Generate DBML run: python manage.py dbml > cdh-web.dbml - name: Login to dbdocs - run: echo ${{ secrets.KEVIN_DBDOCS_KEY }} | dbdocs login + run: echo ${{ secrets.DBDOCS_KEY }} | dbdocs login - name: Push to dbdocs - run: dbdocs build cdh-web.dbml --project cdh-web-gh-actions + run: dbdocs build cdh-web.dbml --project cdh-web # Send a message to slack to report the build status. The webhook is stored # at the organization level and available to all repositories. Only run on From 89b9077b6233484d108e81584375e2cc97fb9cfa Mon Sep 17 00:00:00 2001 From: Kevin McElwee Date: Mon, 14 Dec 2020 16:02:23 -0500 Subject: [PATCH 007/570] Update requirements.lock with new django-dbml --- requirements.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.lock b/requirements.lock index 91bd53d59..42626ea02 100644 --- a/requirements.lock +++ b/requirements.lock @@ -17,7 +17,7 @@ django-cas-ng==4.1.1 django-compressor==2.4 django-compressor-autoprefixer==0.1.0 django-contrib-comments==1.9.2 -django-dbml==0.3.5 +django-dbml==0.4.0 django-debug-toolbar==3.1.1 django-fullurl==1.1 django-taggit==1.3.0 From c46f935f3aeb7ac72f9edcf537e0894fcbb000e2 Mon Sep 17 00:00:00 2001 From: Kevin McElwee Date: Mon, 14 Dec 2020 16:06:32 -0500 Subject: [PATCH 008/570] Update readme with dbdocs --- README.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.rst b/README.rst index db1c70cda..44d95419d 100644 --- a/README.rst +++ b/README.rst @@ -109,6 +109,11 @@ directory:: When building documentation for a production release, use `make docs` to update the published documentation on GitHub Pages. +On every commit, GitHub Actions will generate and then publish a database diagram to `dbdocs @ princetoncdh/cdh-web `_. But to generate locally, install and log into dbdocs. Then run:: + + python manage.py dbml > cdh-web.dbml + dbdocs build cdh-web.dbml --project cdh-web + License ------- This project is licensed under the `Apache 2.0 License `_. From 6b4a9e7ed3e16506672aee74550103866e58714e Mon Sep 17 00:00:00 2001 From: Nick Budak Date: Mon, 6 Jan 2020 15:35:46 -0500 Subject: [PATCH 009/570] Install and configure wagtail - Add wagtail-specific settings to settings.py - Update templates to use wagtail tags - Update urlconf to add wagtail URLs - Add wagtail user bar to base template See #183 --- cdhweb/local_settings.py.sample | 5 ++ cdhweb/settings.py | 41 +++++++++++++---- cdhweb/urls.py | 76 ++++++++++++++++--------------- requirements/prod.txt | 2 + templates/base.html | 6 +-- templates/wagtailadmin/base.html | 7 +++ templates/wagtailadmin/login.html | 11 +++++ 7 files changed, 99 insertions(+), 49 deletions(-) create mode 100644 templates/wagtailadmin/base.html create mode 100644 templates/wagtailadmin/login.html diff --git a/cdhweb/local_settings.py.sample b/cdhweb/local_settings.py.sample index 7193eba9b..f601e51fa 100644 --- a/cdhweb/local_settings.py.sample +++ b/cdhweb/local_settings.py.sample @@ -91,6 +91,11 @@ PUCAS_LDAP.update({ # }, # } +# Wagtail sends email notifications when content is submitted for moderation, +# and when the content is accepted or rejected. +# https://docs.wagtail.io/en/latest/reference/settings.html#email-notifications +WAGTAILADMIN_NOTIFICATION_FROM_EMAIL = 'admin@cdh.princeton.edu' +WAGTAILADMIN_NOTIFICATION_USE_HTML = True ################### diff --git a/cdhweb/settings.py b/cdhweb/settings.py index f16f6811b..3d6a83245 100644 --- a/cdhweb/settings.py +++ b/cdhweb/settings.py @@ -108,6 +108,22 @@ 'textarea', 'tfoot', 'th', 'thead', 'tr', 'tt', '', 'ul', 'var', 'wbr', 'iframe') +#################### +# WAGTAIL SETTINGS # +#################### + +# Human-readable name of your Wagtail site shown on login to the Wagtail admin. +# https://docs.wagtail.io/en/latest/reference/settings.html#site-name +WAGTAIL_SITE_NAME = 'CDH Website' + +# Tags are case-sensitive by default. In many cases the reverse is preferable. +# https://docs.wagtail.io/en/latest/reference/settings.html#case-insensitive-tags +TAGGIT_CASE_INSENSITIVE = True + +# Shows where a particular image, document or snippet is being used on your site. +# Generates a query which may run slowly on sites with large numbers of pages. +# https://docs.wagtail.io/en/latest/reference/settings.html#usage-for-images-documents-and-snippets +WAGTAIL_USAGE_COUNT_ENABLED = True ######################## # MAIN DJANGO SETTINGS # @@ -317,7 +333,20 @@ # "mezzanine.twitter", # "mezzanine.accounts", # "mezzanine.mobile", - "taggit", + 'wagtail.contrib.forms', + 'wagtail.contrib.redirects', + 'wagtail.contrib.search_promotions', # required to avoid https://github.com/wagtail/wagtail/issues/1824 + 'wagtail.embeds', + 'wagtail.sites', + 'wagtail.users', + 'wagtail.snippets', + 'wagtail.documents', + 'wagtail.images', + 'wagtail.search', + 'wagtail.admin', + 'wagtail.core', + 'modelcluster', + 'taggit', 'adminsortable2', "compressor", "fullurl", @@ -356,6 +385,7 @@ # "mezzanine.core.middleware.SitePermissionMiddleware", "mezzanine.pages.middleware.PageMiddleware", "mezzanine.core.middleware.FetchFromCacheMiddleware", + "wagtail.contrib.redirects.middleware.RedirectMiddleware", ) # Store these package names here as they may change in the future since @@ -423,15 +453,6 @@ sys.modules[module_name] = module exec(open(f, "rb").read()) -# if in debug mode and django-debug-toolbar is available, add to installed apps -if DEBUG: - try: - import debug_toolbar - INSTALLED_APPS.append('debug_toolbar') - except ImportError: - pass - - #################### # DYNAMIC SETTINGS # #################### diff --git a/cdhweb/urls.py b/cdhweb/urls.py index 0c32ddcb9..9fae917b7 100644 --- a/cdhweb/urls.py +++ b/cdhweb/urls.py @@ -1,13 +1,15 @@ from __future__ import unicode_literals +import debug_toolbar from django.conf import settings -from django.conf.urls import include, url from django.conf.urls.static import static -from django.conf.urls.i18n import i18n_patterns from django.contrib import admin from django.contrib.sitemaps.views import sitemap -from django.views.i18n import set_language +from django.urls import include, path, re_path from django.views.generic.base import RedirectView, TemplateView +from wagtail.admin import urls as wagtailadmin_urls +from wagtail.core import urls as wagtail_urls +from wagtail.documents import urls as wagtaildocs_urls from cdhweb.blog.sitemaps import BlogPostSitemap from cdhweb.events.sitemaps import EventSitemap @@ -18,21 +20,6 @@ admin.autodiscover() -# Add the urlpatterns for any custom Django applications here. -# You can also change the ``home`` view to add your own functionality -# to the project's homepage. - -urlpatterns = i18n_patterns( - # Change the admin prefix here to use an alternate URL for the - # admin interface, which would be marginally more secure. - url("^admin/", include(admin.site.urls)), -) - -if settings.USE_MODELTRANSLATION: - urlpatterns += [ - url('^i18n/$', set_language, name='set_language'), - ] - sitemaps = { 'blogs': BlogPostSitemap, 'events': EventSitemap, @@ -46,37 +33,54 @@ if getattr(settings, 'SHOW_TEST_WARNING', False): FAVICON = '/static/favicon-test.ico' -urlpatterns += [ - url(r'^robots\.txt$', TemplateView.as_view(template_name='robots.txt', - content_type='text/plain')), - url(r'^favicon\.ico$', RedirectView.as_view(url=FAVICON, permanent=True)), - url("^people/", include("cdhweb.people.urls", namespace='people')), - # actual blog url still TBD - url("^updates/", include("cdhweb.blog.urls", namespace='blog')), - url("^events/", include("cdhweb.events.urls", namespace='event')), - url("^projects/", include("cdhweb.projects.urls", namespace='project')), +urlpatterns = [ + # admin site + path("admin/", include(admin.site.urls)), - url("^$", resource_views.Homepage.as_view(), name="home"), + # special paths + re_path(r'^robots\.txt$', TemplateView.as_view(template_name='robots.txt', + content_type='text/plain')), + re_path(r'^favicon\.ico$', RedirectView.as_view( + url=FAVICON, permanent=True)), + re_path(r'^$', resource_views.Homepage.as_view(), name="home"), + + # debug toolbar + path("__debug__/", include(debug_toolbar.urls)), + + # main apps + path("people/", include("cdhweb.people.urls", namespace='people')), + path("updates/", include("cdhweb.blog.urls", namespace='blog')), + path("events/", include("cdhweb.events.urls", namespace='event')), + path("projects/", include("cdhweb.projects.urls", namespace='project')), # CAS login urls - url(r'^accounts/', include('pucas.cas_urls')), + path("accounts/", include('pucas.cas_urls')), # programmatic redirects from v1 site # - old staff page is now under /people/ - url(r'^about/staff/(?P[\w-]+)/$', - RedirectView.as_view(pattern_name='people:profile', permanent=True), - name='old-profile'), + re_path(r'^about/staff/(?P[\w-]+)/$', + RedirectView.as_view( + pattern_name='people:profile', permanent=True), + name='old-profile'), # - all blog urls are now under updates/ - url(r'^blog(?P.*)$', - RedirectView.as_view(url='/updates%(blog_url)s', permanent=True)), + re_path(r'^blog(?P.*)$', + RedirectView.as_view(url='/updates%(blog_url)s', permanent=True)), # override mezzanine sitemap and use locally customized sitemaps # NOTE: could use a sitemap index and grouped sitemaps here, but # may complicate testing with pa11y-ci - url(r"^sitemap\.xml$", sitemap, {'sitemaps': sitemaps}, name='sitemap'), + re_path(r"^sitemap\.xml$", sitemap, { + 'sitemaps': sitemaps}, name='sitemap'), + + # wagtail paths + # NOTE temporarily make wagtail pages available at pages/ so that they can + # coexist with mezzanine urls + path("cms/", include(wagtailadmin_urls)), + path("documents/", include(wagtaildocs_urls)), + path("pages/", include(wagtail_urls)), # let mezzanine handle everything else - url("^", include("mezzanine.urls")), + re_path(r"", include("mezzanine.urls")), ] # serve static files in development - automatically activates in DEBUG; see diff --git a/requirements/prod.txt b/requirements/prod.txt index e7b281331..ebf93468c 100644 --- a/requirements/prod.txt +++ b/requirements/prod.txt @@ -2,9 +2,11 @@ Django>=2.2,<3.0 pillow>=5.2.0 +chardet<4 # required for wagtail 2.10 git+https://github.com/stephenmcd/mezzanine.git@58aea59#egg=mezzanine # mezzanine 4.3.1 for Django 2.2 git+https://github.com/stephenmcd/filebrowser-safe.git@c7eceb0#egg=filebrowser_safe # filebrowser_safe 1.0.0-alpha.1 for Django 2.2 git+https://github.com/stephenmcd/grappelli-safe.git@7755ffd2#egg=grappelli_safe # grappelli_safe 1.0.0-alpha.1 for Django 2.2 +wagtail django-compressor django-compressor-autoprefixer psycopg2 diff --git a/templates/base.html b/templates/base.html index 354452afa..4cde91ced 100644 --- a/templates/base.html +++ b/templates/base.html @@ -1,11 +1,11 @@ -{% load static pages_tags mezzanine_tags fullurl %} +{% load static pages_tags mezzanine_tags fullurl wagtailuserbar %} {# Google Analytics recommends this implementation now #} - {% if INCLUDE_ANALYTICS %} + {% if INCLUDE_ANALYTICS and not request.is_preview %} {% endif %} - {% block page-title %}{% block page-subtitle %}{% if page %}{{ page.meta_title|add:" | "}}{% endif %}{% endblock %}The Center for Digital Humanities at Princeton{% endblock %} + {% block page-title %}{% if page %}{{ page.seo_title }}{% endif %}{% endblock %} – CDH@Princeton {% if SHOW_TEST_WARNING %} {# test variant favicon to help differentiate test/prod sites #} - + {% else %} - + {% endif %} {% include 'snippets/head_meta.html' %} From 386308dafc5f78de98c08acbd981fe5e253948c1 Mon Sep 17 00:00:00 2001 From: Nick Budak Date: Wed, 24 Mar 2021 10:54:30 -0400 Subject: [PATCH 531/570] Update all metadata, including keywords --- templates/snippets/head_meta.html | 34 +++++++++++++++---------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/templates/snippets/head_meta.html b/templates/snippets/head_meta.html index 560e37a5e..77fd0904c 100644 --- a/templates/snippets/head_meta.html +++ b/templates/snippets/head_meta.html @@ -1,20 +1,20 @@ {% load static cdh_tags %} {# html metadata #} - - - {# determine preview image: specified by page, cdh icon based on url, or default image #} - {% firstof preview_image page.get_absolute_url|url_to_icon_path default_preview_image as meta_preview_image %} - {# open graph metadata #} - - - - - - - {# twitter card #} - - - - - + + +{# determine preview image: specified by page, cdh icon based on url, or default image #} +{% firstof preview_image page.get_url|url_to_icon_path default_preview_image as meta_preview_image %} +{# open graph metadata #} + + + + + + +{# twitter card #} + + + + + From f1f8a165bc50660a6ca56896207dd7ecd87cd036 Mon Sep 17 00:00:00 2001 From: Nick Budak Date: Wed, 24 Mar 2021 14:30:22 -0400 Subject: [PATCH 532/570] Exodize tags on projects, events, and blog posts --- cdhweb/blog/exodus.py | 15 +++++++++++---- cdhweb/events/exodus.py | 13 +++++++++---- cdhweb/projects/exodus.py | 8 ++++++-- 3 files changed, 26 insertions(+), 10 deletions(-) diff --git a/cdhweb/blog/exodus.py b/cdhweb/blog/exodus.py index dd46ef772..b1d3a3de8 100644 --- a/cdhweb/blog/exodus.py +++ b/cdhweb/blog/exodus.py @@ -2,10 +2,13 @@ import logging from mezzanine.core.models import CONTENT_STATUS_PUBLISHED +from taggit.models import Tag -from cdhweb.blog.models import Author, BlogLinkPage, BlogPost, OldBlogPost -from cdhweb.pages.exodus import (convert_slug, exodize_attachments, exodize_history, - get_wagtail_image, to_streamfield) +from cdhweb.blog.models import (Author, BlogLinkPage, BlogPost, BlogPostTag, + OldBlogPost) +from cdhweb.pages.exodus import (convert_slug, exodize_attachments, + exodize_history, get_wagtail_image, + to_streamfield) from cdhweb.people.models import Person @@ -58,4 +61,8 @@ def blog_exodus(): exodize_attachments(post, post_page) exodize_history(post, post_page) - # NOTE no tags to migrate + # exodize keywords as tags + for kw in post.keywords.all(): + logging.debug("exodizing blog tag %s" % kw.keyword.title) + tag = Tag.objects.get_or_create(name=kw.keyword.title)[0] + BlogPostTag.objects.create(content_object=post_page, tag=tag) diff --git a/cdhweb/events/exodus.py b/cdhweb/events/exodus.py index f63efd408..9958825bc 100644 --- a/cdhweb/events/exodus.py +++ b/cdhweb/events/exodus.py @@ -3,9 +3,11 @@ from mezzanine.core.models import CONTENT_STATUS_PUBLISHED -from cdhweb.events.models import Event, EventsLinkPage, OldEvent, Speaker -from cdhweb.pages.exodus import (convert_slug, exodize_attachments, exodize_history, - get_wagtail_image, to_streamfield) +from cdhweb.events.models import (Event, EventsLinkPage, EventTag, OldEvent, + Speaker) +from cdhweb.pages.exodus import (convert_slug, exodize_attachments, + exodize_history, get_wagtail_image, + to_streamfield) from cdhweb.people.models import Person @@ -60,4 +62,7 @@ def event_exodus(): exodize_attachments(event, event_page) exodize_history(event, event_page) - # NOTE no tags to migrate + # exodize tags + for tag in event.tags.all(): + logging.debug("exodizing event tag %s" % tag) + EventTag.objects.create(content_object=event_page, tag=tag) diff --git a/cdhweb/projects/exodus.py b/cdhweb/projects/exodus.py index d90bfde82..26810e597 100644 --- a/cdhweb/projects/exodus.py +++ b/cdhweb/projects/exodus.py @@ -6,7 +6,8 @@ from cdhweb.pages.exodus import (convert_slug, exodize_attachments, exodize_history, get_wagtail_image, to_streamfield) -from cdhweb.projects.models import OldProject, Project, ProjectsLandingPage +from cdhweb.projects.models import (OldProject, Project, ProjectsLandingPage, + ProjectTag) def project_exodus(): @@ -70,4 +71,7 @@ def project_exodus(): exodize_attachments(project, project_page) exodize_history(project, project_page) - # NOTE no tags to migrate + # exodize tags + for tag in project.tags.all(): + logging.debug("exodizing project tag %s" % tag) + ProjectTag.objects.create(content_object=project_page, tag=tag) From 9c5847093b37513f402b8ac5d727050500bb3d25 Mon Sep 17 00:00:00 2001 From: Nick Budak Date: Wed, 24 Mar 2021 17:05:05 -0400 Subject: [PATCH 533/570] Revert context obj name changes to make snippets works on homepage --- .../templates/events/event_archive.html | 4 +- .../templates/events/snippets/event_card.html | 44 +++++++++---------- .../templates/projects/project_list.html | 4 +- .../projects/snippets/project_card.html | 16 +++---- 4 files changed, 34 insertions(+), 34 deletions(-) diff --git a/cdhweb/events/templates/events/event_archive.html b/cdhweb/events/templates/events/event_archive.html index 2ae7ba053..5ab770aeb 100644 --- a/cdhweb/events/templates/events/event_archive.html +++ b/cdhweb/events/templates/events/event_archive.html @@ -33,7 +33,7 @@

{{ title|default:'Upcoming' }} Events

{% endif %} -{% for page in events %} +{% for event in events %} {% include 'events/snippets/event_card.html' %} {% empty %} {# semester event archive will 404 for no events; upcoming does not #} @@ -55,7 +55,7 @@

{{ title|default:'Upcoming' }} Events

{% if past.exists %}

Past Events

- {% for page in past reversed %} {# display in chronological order #} + {% for event in past reversed %} {# display in chronological order #} {% include 'events/snippets/event_card.html' %} {% endfor %} {% endif %} diff --git a/cdhweb/events/templates/events/snippets/event_card.html b/cdhweb/events/templates/events/snippets/event_card.html index 27efad82b..2c82db1a1 100644 --- a/cdhweb/events/templates/events/snippets/event_card.html +++ b/cdhweb/events/templates/events/snippets/event_card.html @@ -1,49 +1,49 @@ {% load wagtailcore_tags wagtailimages_tags %} {# display a single event in card format #} {# FIXME: significant overlap with event_detail, esp. for schema properties #} -{% if page.thumbnail %} - {% image page.thumbnail max-310x240 as event_thumb %} +{% if event.thumbnail %} + {% image event.thumbnail max-310x240 as event_thumb %} {% endif %}
- -
{{ page.type }}
-
+ +
{{ event.type }}
+
-

{{ page.title }}

+

{{ event.title }}

- {% for speaker in page.speakers.all %} + {% for speaker in event.speakers.all %}
{{ speaker.person }}
{% endfor %}
- - + + {# location is required for schema.org #} -
- - {% if not page.is_virtual %} - - {% elif page.join_url %} - +
+ + {% if not event.is_virtual %} + + {% elif event.join_url %} + {% endif %}
{# if duration is more than one day, display start/end days #} - {{ page.start_time|date:"F j" }} + {{ event.start_time|date:"F j" }} {# display date range for multiday event #} - {% if page.duration.days >= 1 %} - - {% if page.start_time.month != page.end_time.month %}{{ page.end_time|date:"F" }}{% endif %} - {{ page.end_time|date:"j" }} + {% if event.duration.days >= 1 %} - + {% if event.start_time.month != event.end_time.month %}{{ event.end_time|date:"F" }}{% endif %} + {{ event.end_time|date:"j" }} {% endif %} {# do not display time on card for multiday event #} - {% if page.duration.days < 1 %} - {{ page.start_time|date:"g:i" }}–{{ page.end_time|date:"g:i A" }} + {% if event.duration.days < 1 %} + {{ event.start_time|date:"g:i" }}–{{ event.end_time|date:"g:i A" }} {% endif %}
{# description is recommended for schema.org #} -
{{ page.search_description }}
+
{{ event.search_description }}
\ No newline at end of file diff --git a/cdhweb/projects/templates/projects/project_list.html b/cdhweb/projects/templates/projects/project_list.html index 4dd3e7f91..1050051e6 100644 --- a/cdhweb/projects/templates/projects/project_list.html +++ b/cdhweb/projects/templates/projects/project_list.html @@ -29,13 +29,13 @@

{{ title }}

{% endif %} {# current projects #} -{% for page in current %} +{% for project in current %} {% include 'projects/snippets/project_card.html' with large=1 %} {% endfor %} {% if past %} {# display past if any #}

{{ past_title }}

-{% for page in past %} +{% for project in past %} {% include 'projects/snippets/project_card.html' with large=1 %} {% endfor %} {% endif %} diff --git a/cdhweb/projects/templates/projects/snippets/project_card.html b/cdhweb/projects/templates/projects/snippets/project_card.html index 8106f1a7f..f0cd51c7d 100644 --- a/cdhweb/projects/templates/projects/snippets/project_card.html +++ b/cdhweb/projects/templates/projects/snippets/project_card.html @@ -1,17 +1,17 @@ {% load wagtailcore_tags wagtailimages_tags %} {# default card display for a project #} -{% if page.thumbnail %} - {% image page.thumbnail max-310x240 as project_thumb %} +{% if project.thumbnail %} + {% image project.thumbnail max-310x240 as project_thumb %} {% endif %}
-{% if page.cdh_built %}
Built by CDH
{% endif %} -{% if page.website_url %} {% endif %} - +{% if project.image %}style="background-image:url('{{ project_thumb.url }}')"{% endif %}> +{% if project.cdh_built %}
Built by CDH
{% endif %} +{% if project.website_url %} {% endif %} +
-

{{ page.title|safe }}

-

{{ page.short_description|safe }}

+

{{ project.title|safe }}

+

{{ project.short_description|safe }}
From 9cdf2c3c112e0079848b000d778f9c256dd46279 Mon Sep 17 00:00:00 2001 From: Nick Budak Date: Wed, 24 Mar 2021 17:05:39 -0400 Subject: [PATCH 534/570] Fix page title calculation to use real title or view title if present --- cdhweb/pages/templates/cdhpages/home_page.html | 11 +++++------ templates/base.html | 4 +++- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/cdhweb/pages/templates/cdhpages/home_page.html b/cdhweb/pages/templates/cdhpages/home_page.html index f879274f2..8e17315bf 100644 --- a/cdhweb/pages/templates/cdhpages/home_page.html +++ b/cdhweb/pages/templates/cdhpages/home_page.html @@ -1,7 +1,8 @@ {% extends 'base.html' %} {% load wagtailcore_tags %} -{% block page-title %}Home{% endblock %} +{# Override entire title so there's no extra context appended #} +{% block title %}{% firstof page.seo_title page.title %}{% endblock %} {% block content %} {# add a class to main content for home-page specific styles #}
@@ -19,15 +20,13 @@ {# display editable page content; wrapped for formatting reasons #}
- {% for block in page.body %} - {% include_block block %} - {% endfor %} + {% include_block page.body %}

Upcoming Events

-{% for page in events %} +{% for event in events %} {% include 'events/snippets/event_card.html' %} {% empty %}
@@ -39,7 +38,7 @@

Upcoming Events

Projects

-{% for page in projects %} +{% for project in projects %} {% include 'projects/snippets/project_card.html' %} {% endfor %}
diff --git a/templates/base.html b/templates/base.html index 31a5b79e8..6bf98eeec 100644 --- a/templates/base.html +++ b/templates/base.html @@ -15,7 +15,9 @@ gtag('config', 'UA-87887700-1', {'anonymize_ip': true}); {% endif %} - {% block page-title %}{% if page %}{{ page.seo_title }}{% endif %}{% endblock %} – CDH@Princeton + {% block title %} + {% block page-title %}{% firstof page.seo_title page.title page_title %}{% endblock %} – CDH@Princeton + {% endblock %} {% if SHOW_TEST_WARNING %} {# test variant favicon to help differentiate test/prod sites #} {% else %} From 163e99e4fbaba33137947b49c64675193b3f6c92 Mon Sep 17 00:00:00 2001 From: Nick Budak Date: Thu, 25 Mar 2021 10:30:19 -0400 Subject: [PATCH 535/570] Add alt to landingpage home link --- cdhweb/pages/templates/cdhpages/landing_page.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cdhweb/pages/templates/cdhpages/landing_page.html b/cdhweb/pages/templates/cdhpages/landing_page.html index 8afa7fdd3..5e45c41ba 100644 --- a/cdhweb/pages/templates/cdhpages/landing_page.html +++ b/cdhweb/pages/templates/cdhpages/landing_page.html @@ -21,7 +21,7 @@
- /

{{ page.title }}

+ /

{{ page.title }}

{{ page.tagline }}

From e17e974ba8e5397cc04edd71ab1e158d1a65fb01 Mon Sep 17 00:00:00 2001 From: rlskoeser Date: Thu, 25 Mar 2021 10:24:56 -0400 Subject: [PATCH 536/570] Configure django user admin list to make it more useful for user mgmt --- cdhweb/resources/admin.py | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 cdhweb/resources/admin.py diff --git a/cdhweb/resources/admin.py b/cdhweb/resources/admin.py new file mode 100644 index 000000000..ec02014ed --- /dev/null +++ b/cdhweb/resources/admin.py @@ -0,0 +1,19 @@ +from django.contrib import admin +from django.contrib.auth.admin import UserAdmin +from django.contrib.auth.models import User + + +class LocalUserAdmin(UserAdmin): + '''Customize user admin list to show last login, superuser, & groups''' + list_display = UserAdmin.list_display + \ + ('is_superuser', 'is_active', 'last_login', 'group_names') + + def group_names(self, obj): + '''custom property to display group membership''' + if obj.groups.exists(): + return ', '.join(g.name for g in obj.groups.all()) + group_names.short_description = 'groups' + + +admin.site.unregister(User) +admin.site.register(User, LocalUserAdmin) From 0c21fbeda97d5193bc24fcff536e8a453cc3ed28 Mon Sep 17 00:00:00 2001 From: Nick Budak Date: Thu, 25 Mar 2021 10:53:01 -0400 Subject: [PATCH 537/570] Don't include missing info in --- templates/snippets/head_meta.html | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/templates/snippets/head_meta.html b/templates/snippets/head_meta.html index 77fd0904c..f65479e8b 100644 --- a/templates/snippets/head_meta.html +++ b/templates/snippets/head_meta.html @@ -1,20 +1,20 @@ {% load static cdh_tags %} {# html metadata #} - - +{% if page.tags.exists %}{% endif %} +{% if page.search_description %}{% endif %} {# determine preview image: specified by page, cdh icon based on url, or default image #} {% firstof preview_image page.get_url|url_to_icon_path default_preview_image as meta_preview_image %} {# open graph metadata #} - + - +{% if page.search_description %}{% endif %} {# twitter card #} - - + +{% if page.search_description %}{% endif %} From 6c128a5c8859129b11d0b75ee372dd5bdfdc4b57 Mon Sep 17 00:00:00 2001 From: Nick Budak Date: Thu, 25 Mar 2021 10:53:11 -0400 Subject: [PATCH 538/570] Fix project list page default title --- cdhweb/projects/templates/projects/project_list.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cdhweb/projects/templates/projects/project_list.html b/cdhweb/projects/templates/projects/project_list.html index 1050051e6..28978eee3 100644 --- a/cdhweb/projects/templates/projects/project_list.html +++ b/cdhweb/projects/templates/projects/project_list.html @@ -1,6 +1,6 @@ {% extends "base.html" %} -{% block page-title %}{{ title|default:'People' }}{% endblock %} +{% block page-title %}{{ title|default:'Projects' }}{% endblock %} {% block bodyattrs %}class="with-cards"{% endblock %} {% block main %} From 358830ffb6239f86c8844582cee755cf095ae5b8 Mon Sep 17 00:00:00 2001 From: Nick Budak Date: Thu, 25 Mar 2021 11:28:55 -0400 Subject: [PATCH 539/570] Use autoescape to fix quotes in titles/descriptions --- templates/snippets/head_meta.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/templates/snippets/head_meta.html b/templates/snippets/head_meta.html index f65479e8b..10bed4008 100644 --- a/templates/snippets/head_meta.html +++ b/templates/snippets/head_meta.html @@ -1,5 +1,6 @@ {% load static cdh_tags %} {# html metadata #} +{% autoescape on %} {% if page.tags.exists %}{% endif %} {% if page.search_description %}{% endif %} {# determine preview image: specified by page, cdh icon based on url, or default image #} @@ -17,4 +18,4 @@ {% if page.search_description %}{% endif %} - +{% endautoescape %} From 2646d358b0d64f61f422a7cf21332b1837a0affb Mon Sep 17 00:00:00 2001 From: Nick Budak Date: Thu, 25 Mar 2021 11:30:06 -0400 Subject: [PATCH 540/570] Use full post url in blogpost embedded meta --- cdhweb/blog/templates/blog/blogpost_detail.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cdhweb/blog/templates/blog/blogpost_detail.html b/cdhweb/blog/templates/blog/blogpost_detail.html index ce78244a5..57f5b3492 100644 --- a/cdhweb/blog/templates/blog/blogpost_detail.html +++ b/cdhweb/blog/templates/blog/blogpost_detail.html @@ -24,7 +24,7 @@

{{ page.title }}

- + {# FIXME: do we need full url here? #} From b71dad364b8a4143cb047c9623d94f4c9968661a Mon Sep 17 00:00:00 2001 From: rlskoeser Date: Thu, 25 Mar 2021 11:59:29 -0400 Subject: [PATCH 541/570] Configure sitemap index and add sitemap for people views --- cdhweb/people/sitemaps.py | 30 +++++++++++++++++++++++------- cdhweb/urls.py | 19 +++++++++++++++++-- 2 files changed, 40 insertions(+), 9 deletions(-) diff --git a/cdhweb/people/sitemaps.py b/cdhweb/people/sitemaps.py index a7c9715d5..b9c7c0f22 100644 --- a/cdhweb/people/sitemaps.py +++ b/cdhweb/people/sitemaps.py @@ -1,11 +1,27 @@ -from cdhweb.people.models import Profile -from cdhweb.resources.sitemaps import PublishedItemSitemap +from django.contrib.sitemaps import Sitemap +from django.urls import reverse +from cdhweb.people import views -class ProfileSitemap(PublishedItemSitemap): - model = Profile + +class PeopleViewsSitemap(Sitemap): + '''Sitemap for people views that are not Wagtail pages but also + not tied to models (currently archive search/browse page only).''' def items(self): - # only published profiles with is_staff actually have detail pages - # and should appear in the sitemap - return super().items().filter(is_staff=True) + # return list of tuple with url name, view object + return [ + ('staff', views.StaffListView), + ('students', views.StudentListView), + ('affiliates', views.AffiliateListView), + ('exec-committee', views.ExecListView) + ] + + def location(self, obj): + # generate url based on archives url names + return reverse('people:%s' % obj[0]) + + def lastmod(self, obj): + # both pages are modified based on changes to digitized works, + # so return the most recent modification time of any of them + return obj[1]().last_modified() diff --git a/cdhweb/urls.py b/cdhweb/urls.py index 738d25532..39ff446c1 100644 --- a/cdhweb/urls.py +++ b/cdhweb/urls.py @@ -6,10 +6,11 @@ from django.urls import include, path, re_path from django.views.generic.base import RedirectView, TemplateView from wagtail.admin import urls as wagtailadmin_urls -from wagtail.contrib.sitemaps.views import sitemap +from wagtail.contrib.sitemaps import views as sitemap_views, Sitemap from wagtail.core import urls as wagtail_urls from wagtail.documents import urls as wagtaildocs_urls +from cdhweb.people.sitemaps import PeopleViewsSitemap admin.autodiscover() @@ -18,6 +19,15 @@ if getattr(settings, 'SHOW_TEST_WARNING', False): FAVICON = '/static/favicon-test.ico' +# sitemap configuration for sections of the site +sitemaps = { + 'pages': Sitemap, # wagtail content pages + 'people': PeopleViewsSitemap, +# 'archive': ArchiveViewsSitemap, +# 'digitizedworks': DigitizedWorkSitemap, +} + + urlpatterns = [ # admin site path("admin/", include(admin.site.urls)), @@ -42,7 +52,12 @@ RedirectView.as_view(url='/updates%(blog_url)s', permanent=True)), # sitemaps - path("sitemap.xml", sitemap), + # sitemaps + path('sitemap.xml', sitemap_views.index, {'sitemaps': sitemaps}, + name='sitemap-index'), + re_path(r'^sitemap-(?P
.+)\.xml$', sitemap_views.sitemap, + {'sitemaps': sitemaps}, + name='django.contrib.sitemaps.views.sitemap'), # wagtail paths # NOTE temporarily make wagtail pages available at pages/ so that they can From 3df0e9323462233624d87a0b9b6e1389fe1db6a1 Mon Sep 17 00:00:00 2001 From: rlskoeser Date: Thu, 25 Mar 2021 16:08:17 -0400 Subject: [PATCH 542/570] Add sitemaps for project & event views --- cdhweb/events/sitemaps.py | 40 +++++++++++++++++++++++++++++++++---- cdhweb/events/views.py | 5 +++-- cdhweb/people/sitemaps.py | 2 +- cdhweb/projects/sitemaps.py | 37 +++++++++++++++++++++------------- cdhweb/urls.py | 7 +++++-- 5 files changed, 68 insertions(+), 23 deletions(-) diff --git a/cdhweb/events/sitemaps.py b/cdhweb/events/sitemaps.py index 3406debdc..700a527d9 100644 --- a/cdhweb/events/sitemaps.py +++ b/cdhweb/events/sitemaps.py @@ -1,6 +1,38 @@ -from cdhweb.events.models import Event -from cdhweb.resources.sitemaps import PublishedItemSitemap +from django.contrib.sitemaps import Sitemap +from django.test import RequestFactory +from django.urls import reverse +from cdhweb.events import views -class EventSitemap(PublishedItemSitemap): - model = Event \ No newline at end of file + +class EventViewsSitemap(Sitemap): + '''Sitemap for project views that are neither Wagtail pages nor + tied to models (currently all list views).''' + + def items(self): + # return list of tuple with url name, view object + factory = RequestFactory() + + urls = [ + (reverse('event:upcoming'), views.UpcomingEventsView()), + ] + for season, year in views.EventSemesterDates() \ + .get_semester_date_list(): + + url = reverse('event:by-semester', + kwargs={'semester': season.lower(), 'year': year}) + request = factory.get(url) + view = views.EventSemesterArchiveView() + view.setup(request) + urls.append(( + url, view + )) + return urls + + def location(self, obj): + return obj[0] + + def lastmod(self, obj): + # both pages are modified based on changes to digitized works, + # so return the most recent modification time of any of them + return obj[1].last_modified() diff --git a/cdhweb/events/views.py b/cdhweb/events/views.py index 76b9936f8..f103aed63 100644 --- a/cdhweb/events/views.py +++ b/cdhweb/events/views.py @@ -10,7 +10,7 @@ from cdhweb.pages.views import LastModifiedListMixin, LastModifiedMixin -class EventMixinView(object): +class EventMixinView: '''View mixin that sets model to Event and returns a published Event queryset.''' model = Event @@ -21,7 +21,7 @@ def get_queryset(self): return Event.objects.live() -class EventSemesterDates(object): +class EventSemesterDates: '''Mixin to return list of event semester dates based on event dates in the system.''' @@ -46,6 +46,7 @@ def get_semester_date_list(self): sem_date = (self.get_semester(date), date.year) if sem_date not in date_list: date_list.append(sem_date) + return date_list diff --git a/cdhweb/people/sitemaps.py b/cdhweb/people/sitemaps.py index b9c7c0f22..b690a0688 100644 --- a/cdhweb/people/sitemaps.py +++ b/cdhweb/people/sitemaps.py @@ -6,7 +6,7 @@ class PeopleViewsSitemap(Sitemap): '''Sitemap for people views that are not Wagtail pages but also - not tied to models (currently archive search/browse page only).''' + not tied to models (currently all people list views).''' def items(self): # return list of tuple with url name, view object diff --git a/cdhweb/projects/sitemaps.py b/cdhweb/projects/sitemaps.py index 83ab18b05..23ce306be 100644 --- a/cdhweb/projects/sitemaps.py +++ b/cdhweb/projects/sitemaps.py @@ -1,17 +1,26 @@ -from cdhweb.projects.models import Project -from cdhweb.resources.sitemaps import PublishedItemSitemap +from django.contrib.sitemaps import Sitemap +from django.urls import reverse +from cdhweb.projects import views -class ProjectSitemap(PublishedItemSitemap): - model = Project - def priority(self, item): - priority = 0.5 - # projects built by cdh should be higher priority - if item.cdh_built: - priority += 0.1 - # projects with live website should be higher priority - if item.website_url: - priority += 0.1 - # (projects built by cdh with live website will be highest priority) - return priority +class ProjectViewsSitemap(Sitemap): + '''Sitemap for project views that are neither Wagtail pages nor + tied to models (currently all project list views).''' + + def items(self): + # return list of tuple with url name, view object + return [ + ('sponsored', views.SponsoredProjectListView), + ('staff', views.StaffProjectListView), + ('working-groups', views.WorkingGroupListView), + ] + + def location(self, obj): + # generate url based on archives url names + return reverse('projects:%s' % obj[0]) + + def lastmod(self, obj): + # both pages are modified based on changes to digitized works, + # so return the most recent modification time of any of them + return obj[1]().last_modified() diff --git a/cdhweb/urls.py b/cdhweb/urls.py index 39ff446c1..28ac39c94 100644 --- a/cdhweb/urls.py +++ b/cdhweb/urls.py @@ -11,6 +11,9 @@ from wagtail.documents import urls as wagtaildocs_urls from cdhweb.people.sitemaps import PeopleViewsSitemap +from cdhweb.projects.sitemaps import ProjectViewsSitemap +from cdhweb.events.sitemaps import EventViewsSitemap + admin.autodiscover() @@ -23,8 +26,8 @@ sitemaps = { 'pages': Sitemap, # wagtail content pages 'people': PeopleViewsSitemap, -# 'archive': ArchiveViewsSitemap, -# 'digitizedworks': DigitizedWorkSitemap, + 'projects': ProjectViewsSitemap, + 'events': EventViewsSitemap, } From 18cc7faff91fb21aeac4c584b37ab8c9754ede9c Mon Sep 17 00:00:00 2001 From: rlskoeser Date: Thu, 25 Mar 2021 16:08:38 -0400 Subject: [PATCH 543/570] Correct last modified list view mixin to fix sort order, return newest --- cdhweb/pages/management/commands/exodus.py | 4 ++-- cdhweb/pages/tests/conftest.py | 4 ++++ cdhweb/pages/tests/test_views.py | 5 +++-- cdhweb/pages/views.py | 11 ++++++----- 4 files changed, 15 insertions(+), 9 deletions(-) diff --git a/cdhweb/pages/management/commands/exodus.py b/cdhweb/pages/management/commands/exodus.py index 72867b09d..dadeca29d 100644 --- a/cdhweb/pages/management/commands/exodus.py +++ b/cdhweb/pages/management/commands/exodus.py @@ -193,7 +193,7 @@ def handle(self, *args, **options): # migrate people pages as link pages if people: people_pages = MezzaninePage.objects \ - .filter(slug__startswith="people/").order_by('-slug') + .filter(slug__startswith="people/") #.order_by('-slug') for page in people_pages: if page.pk not in self.migrated: create_link_page(page, people) @@ -243,7 +243,7 @@ def handle(self, *args, **options): # project list pages become link pages project_pages = MezzaninePage.objects \ - .filter(Q(slug__startswith="projects")).order_by('-slug') + .filter(Q(slug__startswith="projects")) #.order_by('-slug') for page in project_pages: if page.pk not in self.migrated: new_page = create_link_page(page, projects) diff --git a/cdhweb/pages/tests/conftest.py b/cdhweb/pages/tests/conftest.py index 8cc85d581..16e53fc76 100644 --- a/cdhweb/pages/tests/conftest.py +++ b/cdhweb/pages/tests/conftest.py @@ -92,6 +92,10 @@ def order_by(self, key): def first(self): return self.objects[0] + def reverse(self): + self.objects.reverse() + return self + class MyLastModifiedDetailView(LastModifiedMixin, DetailView): # fake view that uses LastModifiedMixin for testing diff --git a/cdhweb/pages/tests/test_views.py b/cdhweb/pages/tests/test_views.py index 816aa8fd4..aa67aa45d 100644 --- a/cdhweb/pages/tests/test_views.py +++ b/cdhweb/pages/tests/test_views.py @@ -46,7 +46,8 @@ class TestLastModifiedListMixin: def test_last_modified(self, mock_dispatch, rf, lmod_list_view, lmod_objects): """should send most recent modified date with response""" # get last modified date for most recent object - most_recent = list(sorted(lmod_objects, key=attrgetter("updated")))[0] + most_recent = list(sorted(lmod_objects, key=attrgetter("updated"), + reverse=True))[0] lmod = most_recent.updated.replace(microsecond=0) # create a fake HttpResponse and check that header is most recent date mock_dispatch.return_value = HttpResponse() @@ -68,7 +69,7 @@ def test_not_modified(self, mock_dispatch, rf, lmod_list_view, lmod_objects): assert response.status_code == 304 @patch("django.views.generic.list.ListView.dispatch") - def test_not_modified(self, mock_dispatch, rf, lmod_list_view, lmod_objects): + def test_modified(self, mock_dispatch, rf, lmod_list_view, lmod_objects): """should serve full object list with 200 if any modified since request""" # get last modified date for most recent object most_recent = list(sorted(lmod_objects, key=attrgetter("updated")))[0] diff --git a/cdhweb/pages/views.py b/cdhweb/pages/views.py index c99dce6f3..753baecc9 100644 --- a/cdhweb/pages/views.py +++ b/cdhweb/pages/views.py @@ -4,8 +4,8 @@ class LastModifiedMixin(View): """Mixin that adds last-modified timestamps to response for detail views. - - Uses Django's get_conditional_response to return a 304 if object has not + + Uses Django's get_conditional_response to return a 304 if object has not been modified since time specified in the HTTP if-modified-since header. """ @@ -36,7 +36,7 @@ def dispatch(self, request, *args, **kwargs): class LastModifiedListMixin(LastModifiedMixin): """Mixin that adds last-modified timestamps to response for list views. - + Uses Django's get_conditional_response to return a 304 if none of the objects in the list have been modified since time specified in the HTTP if-modified-since header. @@ -46,5 +46,6 @@ def last_modified(self): """Get the most recent modification date among all view objects.""" queryset = self.get_queryset() if queryset.exists(): - return getattr(queryset.order_by(self.lastmodified_attr).first(), - self.lastmodified_attr) + return getattr( + queryset.order_by(self.lastmodified_attr).reverse().first(), + self.lastmodified_attr) From cc707cdafd4b608c261d5537be717afa28f1995f Mon Sep 17 00:00:00 2001 From: rlskoeser Date: Thu, 25 Mar 2021 16:18:13 -0400 Subject: [PATCH 544/570] Correct sort order for all last modified listview tests --- cdhweb/pages/tests/test_views.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/cdhweb/pages/tests/test_views.py b/cdhweb/pages/tests/test_views.py index aa67aa45d..4b2245ee4 100644 --- a/cdhweb/pages/tests/test_views.py +++ b/cdhweb/pages/tests/test_views.py @@ -59,7 +59,8 @@ def test_last_modified(self, mock_dispatch, rf, lmod_list_view, lmod_objects): def test_not_modified(self, mock_dispatch, rf, lmod_list_view, lmod_objects): """should serve 304 if no objects have been modified since request""" # get last modified date for most recent object - most_recent = list(sorted(lmod_objects, key=attrgetter("updated")))[0] + most_recent = list(sorted(lmod_objects, key=attrgetter("updated"), + reverse=True))[0] lmod = most_recent.updated + timedelta(seconds=1) request = rf.get("", HTTP_IF_MODIFIED_SINCE=lmod.strftime( "%a, %d %b %Y %H:%M:%S GMT")) @@ -72,7 +73,8 @@ def test_not_modified(self, mock_dispatch, rf, lmod_list_view, lmod_objects): def test_modified(self, mock_dispatch, rf, lmod_list_view, lmod_objects): """should serve full object list with 200 if any modified since request""" # get last modified date for most recent object - most_recent = list(sorted(lmod_objects, key=attrgetter("updated")))[0] + most_recent = list(sorted(lmod_objects, key=attrgetter("updated"), + reverse=True))[0] lmod = most_recent.updated - timedelta(days=1) # request with prior date; should report modified since then request = rf.get("", HTTP_IF_MODIFIED_SINCE=lmod.strftime( From 33605f9f19de6e38e18a2ce17500105dd43dd64a Mon Sep 17 00:00:00 2001 From: rlskoeser Date: Thu, 25 Mar 2021 16:30:24 -0400 Subject: [PATCH 545/570] Preserve nav order when migrating people and project list pages --- cdhweb/pages/management/commands/exodus.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cdhweb/pages/management/commands/exodus.py b/cdhweb/pages/management/commands/exodus.py index dadeca29d..eeebcbb96 100644 --- a/cdhweb/pages/management/commands/exodus.py +++ b/cdhweb/pages/management/commands/exodus.py @@ -193,7 +193,7 @@ def handle(self, *args, **options): # migrate people pages as link pages if people: people_pages = MezzaninePage.objects \ - .filter(slug__startswith="people/") #.order_by('-slug') + .filter(slug__startswith="people/").order_by('_order') for page in people_pages: if page.pk not in self.migrated: create_link_page(page, people) @@ -243,7 +243,7 @@ def handle(self, *args, **options): # project list pages become link pages project_pages = MezzaninePage.objects \ - .filter(Q(slug__startswith="projects")) #.order_by('-slug') + .filter(Q(slug__startswith="projects")).order_by('_order') for page in project_pages: if page.pk not in self.migrated: new_page = create_link_page(page, projects) From 0c796df7e3cf728fc5f997d3552260065929f37c Mon Sep 17 00:00:00 2001 From: rlskoeser Date: Thu, 25 Mar 2021 16:30:38 -0400 Subject: [PATCH 546/570] Cleanup inaccurate comments --- cdhweb/urls.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cdhweb/urls.py b/cdhweb/urls.py index 28ac39c94..5ab745c41 100644 --- a/cdhweb/urls.py +++ b/cdhweb/urls.py @@ -54,7 +54,6 @@ re_path(r'^blog(?P.*)$', RedirectView.as_view(url='/updates%(blog_url)s', permanent=True)), - # sitemaps # sitemaps path('sitemap.xml', sitemap_views.index, {'sitemaps': sitemaps}, name='sitemap-index'), @@ -63,13 +62,13 @@ name='django.contrib.sitemaps.views.sitemap'), # wagtail paths - # NOTE temporarily make wagtail pages available at pages/ so that they can # coexist with mezzanine urls path("cms/", include(wagtailadmin_urls)), path("documents/", include(wagtaildocs_urls)), # enable if needed to test mezzanine pages # path("mezz", include("mezzanine.urls")), + # let wagtail handle everything else path("", include(wagtail_urls)), ] From a4394b8e47d365fd4ea829a71c2216b46dd70b2e Mon Sep 17 00:00:00 2001 From: rlskoeser Date: Thu, 25 Mar 2021 17:19:57 -0400 Subject: [PATCH 547/570] Remove unneeded Q filter --- cdhweb/pages/management/commands/exodus.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cdhweb/pages/management/commands/exodus.py b/cdhweb/pages/management/commands/exodus.py index eeebcbb96..83b2ea8d4 100644 --- a/cdhweb/pages/management/commands/exodus.py +++ b/cdhweb/pages/management/commands/exodus.py @@ -243,7 +243,7 @@ def handle(self, *args, **options): # project list pages become link pages project_pages = MezzaninePage.objects \ - .filter(Q(slug__startswith="projects")).order_by('_order') + .filter(slug__startswith="projects").order_by('_order') for page in project_pages: if page.pk not in self.migrated: new_page = create_link_page(page, projects) From febd671985e06e825df669963bf593f9358924e2 Mon Sep 17 00:00:00 2001 From: rlskoeser Date: Thu, 25 Mar 2021 17:20:21 -0400 Subject: [PATCH 548/570] Clean up copypasta'd sitemap comments --- cdhweb/events/sitemaps.py | 12 +++++++----- cdhweb/people/sitemaps.py | 5 ++--- cdhweb/projects/sitemaps.py | 5 ++--- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/cdhweb/events/sitemaps.py b/cdhweb/events/sitemaps.py index 700a527d9..430b36957 100644 --- a/cdhweb/events/sitemaps.py +++ b/cdhweb/events/sitemaps.py @@ -7,18 +7,20 @@ class EventViewsSitemap(Sitemap): '''Sitemap for project views that are neither Wagtail pages nor - tied to models (currently all list views).''' + tied to models (currently event upcoming and semester list views).''' def items(self): - # return list of tuple with url name, view object + # return list of tuple with url, initialized view object factory = RequestFactory() urls = [ (reverse('event:upcoming'), views.UpcomingEventsView()), ] + # get list of actual semesters with events for season, year in views.EventSemesterDates() \ .get_semester_date_list(): - + # generate url for this date, + # and initialize a view for that url so we can get last modified url = reverse('event:by-semester', kwargs={'semester': season.lower(), 'year': year}) request = factory.get(url) @@ -30,9 +32,9 @@ def items(self): return urls def location(self, obj): + # return the url as generated in items method return obj[0] def lastmod(self, obj): - # both pages are modified based on changes to digitized works, - # so return the most recent modification time of any of them + # return last modified as calculated by the view return obj[1].last_modified() diff --git a/cdhweb/people/sitemaps.py b/cdhweb/people/sitemaps.py index b690a0688..ee0c58036 100644 --- a/cdhweb/people/sitemaps.py +++ b/cdhweb/people/sitemaps.py @@ -18,10 +18,9 @@ def items(self): ] def location(self, obj): - # generate url based on archives url names + # generate url based on url name within people url namespace return reverse('people:%s' % obj[0]) def lastmod(self, obj): - # both pages are modified based on changes to digitized works, - # so return the most recent modification time of any of them + # return last modified as calculated by the view return obj[1]().last_modified() diff --git a/cdhweb/projects/sitemaps.py b/cdhweb/projects/sitemaps.py index 23ce306be..782b32977 100644 --- a/cdhweb/projects/sitemaps.py +++ b/cdhweb/projects/sitemaps.py @@ -17,10 +17,9 @@ def items(self): ] def location(self, obj): - # generate url based on archives url names + # generate url based on url name within projects url namespace return reverse('projects:%s' % obj[0]) def lastmod(self, obj): - # both pages are modified based on changes to digitized works, - # so return the most recent modification time of any of them + # return last modified as calculated by the view return obj[1]().last_modified() From 17f33d1c46b7d0135eca7add050682da15583d40 Mon Sep 17 00:00:00 2001 From: rlskoeser Date: Thu, 25 Mar 2021 17:20:43 -0400 Subject: [PATCH 549/570] Add tests for people, projects, and event sitemaps --- cdhweb/events/tests/test_sitemaps.py | 42 ++++++++++++++++++++++++++ cdhweb/people/tests/test_sitemaps.py | 36 ++++++++++++++++++++++ cdhweb/projects/tests/test_sitemaps.py | 37 +++++++++++++++++++++++ 3 files changed, 115 insertions(+) create mode 100644 cdhweb/events/tests/test_sitemaps.py create mode 100644 cdhweb/people/tests/test_sitemaps.py create mode 100644 cdhweb/projects/tests/test_sitemaps.py diff --git a/cdhweb/events/tests/test_sitemaps.py b/cdhweb/events/tests/test_sitemaps.py new file mode 100644 index 000000000..06cc6a568 --- /dev/null +++ b/cdhweb/events/tests/test_sitemaps.py @@ -0,0 +1,42 @@ +from django.urls import reverse +import pytest + +from cdhweb.events import views +from cdhweb.events.sitemaps import EventViewsSitemap + + +class TestEventViewsSitemap: + + @pytest.mark.django_db + def test_items(self, deadline): + semester_dates = views.EventSemesterDates().get_semester_date_list() + + items = EventViewsSitemap().items() + # expect one for each semester date plus upcoming + assert len(items) == len(semester_dates) + 1 + + urls = [i[0] for i in items] + url_views = [i[1] for i in items] + + assert reverse('events:upcoming') in urls + # views should be instantiated, since semester archive needs args + assert isinstance(url_views[0], views.UpcomingEventsView) + assert isinstance(url_views[1], views.EventSemesterArchiveView) + + def test_location(self): + loc = reverse('events:upcoming') + # location is returned as is + assert EventViewsSitemap().location((loc,)) == loc + + @pytest.mark.django_db + def test_lastmod(self, deadline): + # fixture to ensure we have at least one upcoming event + assert EventViewsSitemap().lastmod(('upcoming', + views.UpcomingEventsView())) ==\ + views.UpcomingEventsView().last_modified() + + @pytest.mark.django_db + def test_get(self, client): + # test that it actually renders, to catch any other problems + resp = client.get('/sitemap-events.xml') + assert resp.status_code == 200 diff --git a/cdhweb/people/tests/test_sitemaps.py b/cdhweb/people/tests/test_sitemaps.py new file mode 100644 index 000000000..5e7552171 --- /dev/null +++ b/cdhweb/people/tests/test_sitemaps.py @@ -0,0 +1,36 @@ +from django.urls import reverse +import pytest + +from cdhweb.people import views +from cdhweb.people.sitemaps import PeopleViewsSitemap + + +class TestPeopleViewsSitemap: + + def test_items(self): + items = PeopleViewsSitemap().items() + url_names = [i[0] for i in items] + url_views = [i[1] for i in items] + + for url_name in ['staff', 'students', 'affiliates', 'exec-committee']: + assert url_name in url_names + + for view in [views.StaffListView, views.StudentListView, + views.AffiliateListView, views.ExecListView]: + assert view in url_views + + def test_location(self): + assert PeopleViewsSitemap().location(('staff',)) \ + == reverse('people:staff') + + @pytest.mark.django_db + def test_lastmod(self, staffer): + # fixture to ensure we have at least one record with a date + assert PeopleViewsSitemap().lastmod(('staff', views.StaffListView)) ==\ + views.StaffListView().last_modified() + + @pytest.mark.django_db + def test_get(self, client): + # test that it actually renders, to catch any other problems + resp = client.get('/sitemap-people.xml') + assert resp.status_code == 200 diff --git a/cdhweb/projects/tests/test_sitemaps.py b/cdhweb/projects/tests/test_sitemaps.py new file mode 100644 index 000000000..a1172afb3 --- /dev/null +++ b/cdhweb/projects/tests/test_sitemaps.py @@ -0,0 +1,37 @@ +from django.urls import reverse +import pytest + +from cdhweb.projects import views +from cdhweb.projects.sitemaps import ProjectViewsSitemap + + +class TestProjectViewsSitemap: + + def test_items(self): + items = ProjectViewsSitemap().items() + url_names = [i[0] for i in items] + url_views = [i[1] for i in items] + + for url_name in ['sponsored', 'staff', 'working-groups']: + assert url_name in url_names + + for view in [views.SponsoredProjectListView, + views.StaffProjectListView, views.WorkingGroupListView]: + assert view in url_views + + def test_location(self): + assert ProjectViewsSitemap().location(('staff',)) \ + == reverse('projects:staff') + + @pytest.mark.django_db + def test_lastmod(self, derrida): + # fixture to ensure we have at least one record with a date + assert ProjectViewsSitemap().lastmod(('staff', + views.StaffProjectListView)) == \ + views.StaffProjectListView().last_modified() + + @pytest.mark.django_db + def test_get(self, client): + # test that it actually renders, to catch any other problems + resp = client.get('/sitemap-projects.xml') + assert resp.status_code == 200 From 6c2d38aad0d4141273dd1e7318bc968d52e0b187 Mon Sep 17 00:00:00 2001 From: rlskoeser Date: Thu, 25 Mar 2021 18:01:42 -0400 Subject: [PATCH 550/570] Add and test sitemap for blog list views --- cdhweb/blog/sitemaps.py | 54 ++++++++++++++++++++++++++++++ cdhweb/blog/tests/test_sitemaps.py | 48 ++++++++++++++++++++++++++ 2 files changed, 102 insertions(+) create mode 100644 cdhweb/blog/sitemaps.py create mode 100644 cdhweb/blog/tests/test_sitemaps.py diff --git a/cdhweb/blog/sitemaps.py b/cdhweb/blog/sitemaps.py new file mode 100644 index 000000000..983d20ee8 --- /dev/null +++ b/cdhweb/blog/sitemaps.py @@ -0,0 +1,54 @@ +from django.contrib.sitemaps import Sitemap +from django.urls import reverse + +from cdhweb.blog.models import BlogPost + + +class BlogListSitemap(Sitemap): + '''Sitemap for block views that are neither Wagtail pages nor + tied to models (currently event recent and archive list views).''' + + def items(self): + # return list of tuples for identifying blog list views + # - could be url name, year, or year + month + # factory = RequestFactory() + + items = [ + ('list',) + ] + + live_posts = BlogPost.objects.live() + for date in live_posts.dates('first_published_at', 'year', + order='DESC'): + items.append((date.year,)) + + for date in live_posts.dates('first_published_at', 'month', + order='DESC'): + items.append((date.year, date.month)) + return items + + def location(self, obj): + # determine url to generate based on length/content + # two args — year/month archive + if len(obj) == 2: + return reverse('blog:by-month', kwargs={'year': obj[0], + 'month': '%02d' % obj[1]}) + # single arg, numeric — year archive + elif str(obj[0]).isdigit(): + return reverse('blog:by-year', args=obj) + # non-numeric — named url + else: + return reverse('blog:%s' % obj[0]) + + return obj[0] + + def lastmod(self, obj): + posts = BlogPost.objects.live().order_by('-first_published_at') + # if first element is numeric, filter by year + if str(obj[0]).isdigit(): + posts = posts.filter(first_published_at__year=obj[0]) + # if two args, also filter by month + if len(obj) == 2: + posts = posts.filter(first_published_at__month=obj[1]) + + return posts.first().first_published_at diff --git a/cdhweb/blog/tests/test_sitemaps.py b/cdhweb/blog/tests/test_sitemaps.py new file mode 100644 index 000000000..b38141b85 --- /dev/null +++ b/cdhweb/blog/tests/test_sitemaps.py @@ -0,0 +1,48 @@ +from django.urls import reverse +import pytest + +from cdhweb.blog.sitemaps import BlogListSitemap + + +class TestBlogListSitemap: + + @pytest.mark.django_db + def test_items(self, announcement): + items = BlogListSitemap().items() + # expect three: list, year, year+month + assert len(items) == 3 + + assert ('list',) in items + assert (announcement.first_published_at.year, ) in items + assert (announcement.first_published_at.year, + announcement.first_published_at.month) in items + + def test_location(self): + # named url + assert BlogListSitemap().location(('list',)) == reverse('blog:list') + # year only + assert BlogListSitemap().location((2020,)) == \ + reverse('blog:by-year', args=[2020]) + # year + month; requires two-digit month + assert BlogListSitemap().location((2019, 3)) == \ + reverse('blog:by-month', args=[2019, '03']) + + @pytest.mark.django_db + def test_lastmod(self, announcement, article): + # announcement fixture published yesterday, most recent for list + blogsitemap = BlogListSitemap() + assert blogsitemap.lastmod(('list', )) \ + == announcement.first_published_at + + assert blogsitemap.lastmod((article.first_published_at.year, )) \ + == article.first_published_at + + assert blogsitemap.lastmod((article.first_published_at.year, + article.first_published_at.month)) \ + == article.first_published_at + + @pytest.mark.django_db + def test_get(self, client, announcement): + # test that it actually renders, to catch any other problems + resp = client.get('/sitemap-blog.xml') + assert resp.status_code == 200 From 7d2b2eae2c256db6f07224488623fe08d5e22f7c Mon Sep 17 00:00:00 2001 From: rlskoeser Date: Thu, 25 Mar 2021 18:02:02 -0400 Subject: [PATCH 551/570] Rename list view sitemaps to be more informative --- cdhweb/events/sitemaps.py | 4 ++-- cdhweb/events/tests/test_sitemaps.py | 12 ++++++------ cdhweb/people/sitemaps.py | 2 +- cdhweb/people/tests/test_sitemaps.py | 10 +++++----- cdhweb/projects/sitemaps.py | 2 +- cdhweb/projects/tests/test_sitemaps.py | 12 ++++++------ cdhweb/urls.py | 14 ++++++++------ 7 files changed, 29 insertions(+), 27 deletions(-) diff --git a/cdhweb/events/sitemaps.py b/cdhweb/events/sitemaps.py index 430b36957..a1b5fb419 100644 --- a/cdhweb/events/sitemaps.py +++ b/cdhweb/events/sitemaps.py @@ -5,8 +5,8 @@ from cdhweb.events import views -class EventViewsSitemap(Sitemap): - '''Sitemap for project views that are neither Wagtail pages nor +class EventListSitemap(Sitemap): + '''Sitemap for event views that are neither Wagtail pages nor tied to models (currently event upcoming and semester list views).''' def items(self): diff --git a/cdhweb/events/tests/test_sitemaps.py b/cdhweb/events/tests/test_sitemaps.py index 06cc6a568..7da8496ea 100644 --- a/cdhweb/events/tests/test_sitemaps.py +++ b/cdhweb/events/tests/test_sitemaps.py @@ -2,16 +2,16 @@ import pytest from cdhweb.events import views -from cdhweb.events.sitemaps import EventViewsSitemap +from cdhweb.events.sitemaps import EventListSitemap -class TestEventViewsSitemap: +class TestEventListSitemap: @pytest.mark.django_db def test_items(self, deadline): semester_dates = views.EventSemesterDates().get_semester_date_list() - items = EventViewsSitemap().items() + items = EventListSitemap().items() # expect one for each semester date plus upcoming assert len(items) == len(semester_dates) + 1 @@ -26,13 +26,13 @@ def test_items(self, deadline): def test_location(self): loc = reverse('events:upcoming') # location is returned as is - assert EventViewsSitemap().location((loc,)) == loc + assert EventListSitemap().location((loc,)) == loc @pytest.mark.django_db def test_lastmod(self, deadline): # fixture to ensure we have at least one upcoming event - assert EventViewsSitemap().lastmod(('upcoming', - views.UpcomingEventsView())) ==\ + assert EventListSitemap().lastmod(('upcoming', + views.UpcomingEventsView())) ==\ views.UpcomingEventsView().last_modified() @pytest.mark.django_db diff --git a/cdhweb/people/sitemaps.py b/cdhweb/people/sitemaps.py index ee0c58036..b9da0e8cc 100644 --- a/cdhweb/people/sitemaps.py +++ b/cdhweb/people/sitemaps.py @@ -4,7 +4,7 @@ from cdhweb.people import views -class PeopleViewsSitemap(Sitemap): +class PeopleListSitemap(Sitemap): '''Sitemap for people views that are not Wagtail pages but also not tied to models (currently all people list views).''' diff --git a/cdhweb/people/tests/test_sitemaps.py b/cdhweb/people/tests/test_sitemaps.py index 5e7552171..430d47928 100644 --- a/cdhweb/people/tests/test_sitemaps.py +++ b/cdhweb/people/tests/test_sitemaps.py @@ -2,13 +2,13 @@ import pytest from cdhweb.people import views -from cdhweb.people.sitemaps import PeopleViewsSitemap +from cdhweb.people.sitemaps import PeopleListSitemap -class TestPeopleViewsSitemap: +class TestPeopleListSitemap: def test_items(self): - items = PeopleViewsSitemap().items() + items = PeopleListSitemap().items() url_names = [i[0] for i in items] url_views = [i[1] for i in items] @@ -20,13 +20,13 @@ def test_items(self): assert view in url_views def test_location(self): - assert PeopleViewsSitemap().location(('staff',)) \ + assert PeopleListSitemap().location(('staff',)) \ == reverse('people:staff') @pytest.mark.django_db def test_lastmod(self, staffer): # fixture to ensure we have at least one record with a date - assert PeopleViewsSitemap().lastmod(('staff', views.StaffListView)) ==\ + assert PeopleListSitemap().lastmod(('staff', views.StaffListView)) ==\ views.StaffListView().last_modified() @pytest.mark.django_db diff --git a/cdhweb/projects/sitemaps.py b/cdhweb/projects/sitemaps.py index 782b32977..9d5beae7c 100644 --- a/cdhweb/projects/sitemaps.py +++ b/cdhweb/projects/sitemaps.py @@ -4,7 +4,7 @@ from cdhweb.projects import views -class ProjectViewsSitemap(Sitemap): +class ProjectListSitemap(Sitemap): '''Sitemap for project views that are neither Wagtail pages nor tied to models (currently all project list views).''' diff --git a/cdhweb/projects/tests/test_sitemaps.py b/cdhweb/projects/tests/test_sitemaps.py index a1172afb3..a3c2f1838 100644 --- a/cdhweb/projects/tests/test_sitemaps.py +++ b/cdhweb/projects/tests/test_sitemaps.py @@ -2,13 +2,13 @@ import pytest from cdhweb.projects import views -from cdhweb.projects.sitemaps import ProjectViewsSitemap +from cdhweb.projects.sitemaps import ProjectListSitemap -class TestProjectViewsSitemap: +class TestProjectListSitemap: def test_items(self): - items = ProjectViewsSitemap().items() + items = ProjectListSitemap().items() url_names = [i[0] for i in items] url_views = [i[1] for i in items] @@ -20,14 +20,14 @@ def test_items(self): assert view in url_views def test_location(self): - assert ProjectViewsSitemap().location(('staff',)) \ + assert ProjectListSitemap().location(('staff',)) \ == reverse('projects:staff') @pytest.mark.django_db def test_lastmod(self, derrida): # fixture to ensure we have at least one record with a date - assert ProjectViewsSitemap().lastmod(('staff', - views.StaffProjectListView)) == \ + assert ProjectListSitemap().lastmod(('staff', + views.StaffProjectListView)) == \ views.StaffProjectListView().last_modified() @pytest.mark.django_db diff --git a/cdhweb/urls.py b/cdhweb/urls.py index 5ab745c41..62bd4cdc4 100644 --- a/cdhweb/urls.py +++ b/cdhweb/urls.py @@ -10,9 +10,10 @@ from wagtail.core import urls as wagtail_urls from wagtail.documents import urls as wagtaildocs_urls -from cdhweb.people.sitemaps import PeopleViewsSitemap -from cdhweb.projects.sitemaps import ProjectViewsSitemap -from cdhweb.events.sitemaps import EventViewsSitemap +from cdhweb.blog.sitemaps import BlogListSitemap +from cdhweb.people.sitemaps import PeopleListSitemap +from cdhweb.projects.sitemaps import ProjectListSitemap +from cdhweb.events.sitemaps import EventListSitemap admin.autodiscover() @@ -25,9 +26,10 @@ # sitemap configuration for sections of the site sitemaps = { 'pages': Sitemap, # wagtail content pages - 'people': PeopleViewsSitemap, - 'projects': ProjectViewsSitemap, - 'events': EventViewsSitemap, + 'people': PeopleListSitemap, + 'projects': ProjectListSitemap, + 'events': EventListSitemap, + 'blog': BlogListSitemap, } From 77f362b254bca43c0531a475bedec71802d4261b Mon Sep 17 00:00:00 2001 From: rlskoeser Date: Thu, 25 Mar 2021 18:06:52 -0400 Subject: [PATCH 552/570] Remove old mezzanine sitemap code --- cdhweb/resources/sitemaps.py | 27 --------------------------- 1 file changed, 27 deletions(-) delete mode 100644 cdhweb/resources/sitemaps.py diff --git a/cdhweb/resources/sitemaps.py b/cdhweb/resources/sitemaps.py deleted file mode 100644 index 530fe8561..000000000 --- a/cdhweb/resources/sitemaps.py +++ /dev/null @@ -1,27 +0,0 @@ -from django.contrib.sitemaps import Sitemap -from django.core.exceptions import ObjectDoesNotExist - -from mezzanine.pages.models import Page - - -class PublishedItemSitemap(Sitemap): - '''Generic sitemap with common logic for displayable models''' - - #: django model to use for items - model = None - - def items(self): - return self.model.objects.published() - - # location uses get_absolute_url by default - - def lastmod(self, item): - return item.updated or item.published - - -class PageSitemap(PublishedItemSitemap): - '''Sitemap for pages; includes rich text pages and landing pages''' - model = Page - - def items(self): - return super().items().filter(in_sitemap=True) From 2a4cc4c1f2285644f71423515386e8af9459bd4c Mon Sep 17 00:00:00 2001 From: rlskoeser Date: Thu, 25 Mar 2021 18:07:14 -0400 Subject: [PATCH 553/570] Remove redundant/outdated child pages test --- cdhweb/resources/tests/test_views.py | 36 ---------------------------- 1 file changed, 36 deletions(-) diff --git a/cdhweb/resources/tests/test_views.py b/cdhweb/resources/tests/test_views.py index ae382e4e9..49380caa6 100644 --- a/cdhweb/resources/tests/test_views.py +++ b/cdhweb/resources/tests/test_views.py @@ -1,44 +1,8 @@ -import string -from datetime import timedelta -from unittest import skip - from django.contrib.sites.models import Site -from django.test import TestCase -from django.urls import reverse -from django.utils import timezone -from mezzanine.pages.models import Page -from mezzanine.core.models import CONTENT_STATUS_DRAFT import pytest -from cdhweb.blog.models import BlogPost -from cdhweb.events.models import Event, EventType -from cdhweb.projects.models import Project, GrantType, Grant -from cdhweb.resources.models import LandingPage -from cdhweb.resources.sitemaps import PageSitemap from cdhweb.resources.utils import absolutize_url -@skip("fixme - move to pages") -class TestViews(TestCase): - fixtures = ['test_pages.json'] - - def test_child_pages_attachment(self): - about = Page.objects.get(title='About') - annual_report = Page.objects.get(title='Annual Report') - response = self.client.get(about.get_absolute_url()) - # page-children attachment section should be present - self.assertContains( - response, '
') - # child page title and url should be present - self.assertContains(response, annual_report.title) - self.assertContains(response, annual_report.get_absolute_url()) - - # delete child page to check behavior without - annual_report.delete() - response = self.client.get(about.get_absolute_url()) - # should not error, should not contain page-children attachment section - self.assertNotContains( - response, '
') - @pytest.mark.django_db def test_absolutize_url(): From 24b6e8cc1a6303756283ce2d58cd8359dd9015ed Mon Sep 17 00:00:00 2001 From: Nick Budak Date: Mon, 29 Mar 2021 14:08:27 -0400 Subject: [PATCH 554/570] Correct admin search field naming for Events --- cdhweb/events/wagtail_hooks.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cdhweb/events/wagtail_hooks.py b/cdhweb/events/wagtail_hooks.py index dfb4828c0..8d40f093a 100644 --- a/cdhweb/events/wagtail_hooks.py +++ b/cdhweb/events/wagtail_hooks.py @@ -15,7 +15,7 @@ class EventAdmin(ThumbnailMixin, ModelAdmin): "speaker_list", "attendance", "join_url", "content", "tags", "updated") export_filename = "cdhweb-events" search_fields = ("title", "speakers__person__first_name", - "speakers__person__last_name", "content", "type", + "speakers__person__last_name", "body", "type", "sponsor", "location") exclude_from_explorer = True thumb_image_field_name = "thumbnail" From 3856bc0991292b5c04e77436047627b442446401 Mon Sep 17 00:00:00 2001 From: Nick Budak Date: Mon, 29 Mar 2021 14:25:06 -0400 Subject: [PATCH 555/570] Remove broken attachment exodus check --- cdhweb/pages/management/commands/exodus.py | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/cdhweb/pages/management/commands/exodus.py b/cdhweb/pages/management/commands/exodus.py index 83b2ea8d4..519ce7c46 100644 --- a/cdhweb/pages/management/commands/exodus.py +++ b/cdhweb/pages/management/commands/exodus.py @@ -216,7 +216,8 @@ def handle(self, *args, **options): Redirect.add_redirect( '/projects/about/', redirect_to=projects, is_permanent=True) except MezzaninePage.DoesNotExist: - logging.warning("no projects landing page found; skipping projects") + logging.warning( + "no projects landing page found; skipping projects") pass if projects: @@ -294,19 +295,6 @@ def handle(self, *args, **options): for page in unmigrated: print('\t%s — slug/url %s)' % (page, page.slug)) - # report on unmigrated attachments - attachment_pages = set(chain.from_iterable( - [a.pages.all() for a in Attachment.objects.all()])) - new_attachment_pages = list(filter(lambda p: hasattr(p, "attachments"), - Page.objects.all())) - n_old_pages = len(attachment_pages) - n_new_pages = len(new_attachment_pages) - if n_old_pages > n_new_pages: - missing_pages = set([p.title for p in attachment_pages]) - \ - set([p.title for p in new_attachment_pages]) - logging.warning("%d pages with umigrated attachments: %s" % ( - n_old_pages - n_new_pages, ", ".join(missing_pages))) - # delete mezzanine pages here? (but keep for testing migration) def get_collection(self, name): From 57b33f834ac891652566299f1c03536149dfdc80 Mon Sep 17 00:00:00 2001 From: rlskoeser Date: Mon, 29 Mar 2021 16:17:50 -0400 Subject: [PATCH 556/570] Set primary nav links active if current url starts with nav url --- cdhweb/resources/templatetags/cdh_tags.py | 8 ++++++++ cdhweb/resources/tests/test_tags.py | 6 ++++++ templates/snippets/navigation_card.html | 3 ++- templates/snippets/primary_navigation.html | 4 ++-- 4 files changed, 18 insertions(+), 3 deletions(-) diff --git a/cdhweb/resources/templatetags/cdh_tags.py b/cdhweb/resources/templatetags/cdh_tags.py index 4de9cd754..5aad4ad5c 100644 --- a/cdhweb/resources/templatetags/cdh_tags.py +++ b/cdhweb/resources/templatetags/cdh_tags.py @@ -36,6 +36,7 @@ def url_to_icon(value): return icon return '' + @register.filter def url_to_icon_path(value): '''Return absolute path to CDH icon name based on URL.''' @@ -43,3 +44,10 @@ def url_to_icon_path(value): if img: return absolutize_url('{}img/cdh-icons/png@2X/{}@2x.png'.format(settings.STATIC_URL, img)) return '' + + +@register.filter('startswith') +def startswith(text, starts): + if isinstance(text, str): + return text.startswith(starts) + return False diff --git a/cdhweb/resources/tests/test_tags.py b/cdhweb/resources/tests/test_tags.py index 25f33d8df..5d2442817 100644 --- a/cdhweb/resources/tests/test_tags.py +++ b/cdhweb/resources/tests/test_tags.py @@ -21,3 +21,9 @@ def test_url_to_icon_path(): domain = Site.objects.get_current().domain assert cdh_tags.url_to_icon_path('/people/staff/') == \ 'https://{}/static/img/cdh-icons/png@2X/ppl@2x.png'.format(domain) + + +def test_startswith(): + assert cdh_tags.startswith('yes', 'y') + assert not cdh_tags.startswith('no', 'y') + assert not cdh_tags.startswith(3, 'y') diff --git a/templates/snippets/navigation_card.html b/templates/snippets/navigation_card.html index f1c393702..3d94d0f7e 100644 --- a/templates/snippets/navigation_card.html +++ b/templates/snippets/navigation_card.html @@ -1,4 +1,5 @@ {# secondary and tertiary naviation for the top-level of the site #} +{% load cdh_tags %} {% if navpages %}
@@ -10,7 +11,7 @@ href="{{ navpage.get_url }}" tabindex="-1" {% if navpage.get_children.live.in_menu %} aria-owns="{{ navpage.slug }}-tertiary"{% endif %} - {% if navpage.get_url == request.path %} aria-current="page"{% endif %}>{{ navpage.title }} + {% if request.path|startswith:navpage.get_url %} aria-current="page"{% endif %}>{{ navpage.title }} {% include "snippets/tertiary_navigation.html" with navpages=navpage.get_children.live.in_menu %} {% endfor %} diff --git a/templates/snippets/primary_navigation.html b/templates/snippets/primary_navigation.html index 9d6f5798c..e120ddb7f 100644 --- a/templates/snippets/primary_navigation.html +++ b/templates/snippets/primary_navigation.html @@ -1,4 +1,4 @@ -{% load i18n %} +{% load i18n cdh_tags %} {# top level menu, with secondary nav for current site section #}
{# top-level pages #} @@ -17,7 +17,7 @@ aria-haspopup="true" aria-expanded="false" {% endif %} - {% if navpage.get_url == request.path %} aria-current="page"{% endif %}>{{ navpage.title }} + {% if request.path|startswith:navpage.get_url %} aria-current="page"{% endif %}>{{ navpage.title }} {% endif %} From 932e6d89e7f9c671e69f092c584611eaa7eb3d10 Mon Sep 17 00:00:00 2001 From: rlskoeser Date: Mon, 29 Mar 2021 16:31:56 -0400 Subject: [PATCH 557/570] Make sure month list from fixtures is unique in test --- cdhweb/blog/tests/test_views.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cdhweb/blog/tests/test_views.py b/cdhweb/blog/tests/test_views.py index c0f9f990b..e7c7db764 100644 --- a/cdhweb/blog/tests/test_views.py +++ b/cdhweb/blog/tests/test_views.py @@ -14,7 +14,7 @@ def test_month_list(self, client, blog_posts): dates = [post.first_published_at for _title, post in blog_posts.items()] # months will appear as datetime.date objects with day set to 1 - months = [date(pubdate.year, pubdate.month, 1) for pubdate in dates] + months = set([date(pubdate.year, pubdate.month, 1) for pubdate in dates]) # should be ordered with most recent first assert list(response.context["date_list"]) == \ sorted(months, reverse=True) @@ -35,7 +35,7 @@ def test_month_list(self, client, blog_posts): dates = [post.first_published_at for _title, post in blog_posts.items()] # months will appear as datetime.date objects with day set to 1 - months = [date(pubdate.year, pubdate.month, 1) for pubdate in dates] + months = set([date(pubdate.year, pubdate.month, 1) for pubdate in dates]) # should be ordered with most recent first assert list(response.context["date_list"]) == \ sorted(months, reverse=True) From 6564ed2476c2c609ea7e96770bcd586a11b93c83 Mon Sep 17 00:00:00 2001 From: Nick Budak Date: Mon, 29 Mar 2021 17:14:58 -0400 Subject: [PATCH 558/570] Use consistent context naming for page meta titles; remove defaults --- cdhweb/blog/templates/blog/blogpost_archive.html | 6 +++--- cdhweb/blog/tests/test_views.py | 4 ++-- cdhweb/blog/views.py | 11 +++++++++-- cdhweb/events/templates/events/event_archive.html | 6 +++--- cdhweb/events/views.py | 5 +++-- cdhweb/people/templates/people/person_list.html | 4 ++-- cdhweb/people/views.py | 2 +- cdhweb/projects/templates/projects/project_list.html | 6 +++--- cdhweb/projects/tests/test_views.py | 2 +- cdhweb/projects/views.py | 2 +- 10 files changed, 28 insertions(+), 20 deletions(-) diff --git a/cdhweb/blog/templates/blog/blogpost_archive.html b/cdhweb/blog/templates/blog/blogpost_archive.html index 4f25c4bb2..099504619 100644 --- a/cdhweb/blog/templates/blog/blogpost_archive.html +++ b/cdhweb/blog/templates/blog/blogpost_archive.html @@ -1,15 +1,15 @@ {% extends 'blog/base.html' %} {% load humanize %} -{% block page-title %}{{ title|default:'Latest' }} Updates{% endblock %} +{% block page-title %}{{ page_title }}{% endblock %} {% block main %}
-

{{ title|default:'Latest' }} Updates

+

{{ page_title }}

- Latest + {{ page_title }}
    {# include latest blogposts page link #} {% url 'blog:list' as latest_url %} diff --git a/cdhweb/blog/tests/test_views.py b/cdhweb/blog/tests/test_views.py index e7c7db764..6c6eb2e3f 100644 --- a/cdhweb/blog/tests/test_views.py +++ b/cdhweb/blog/tests/test_views.py @@ -22,7 +22,7 @@ def test_month_list(self, client, blog_posts): def test_title(self, client, blog_posts): """blog post year archive should add year to context as title""" response = client.get(reverse("blog:by-year", kwargs={"year": "2019"})) - assert response.context["title"] == "2019" + assert response.context["page_title"] == "2019 Updates" class TestBlogMonthArchiveView: @@ -44,7 +44,7 @@ def test_title(self, client, blog_posts): """blog post year archive should add year/month to context as title""" response = client.get(reverse("blog:by-month", kwargs={"year": "2019", "month": "03"})) - assert response.context["title"] == "March 2019" + assert response.context["page_title"] == "March 2019 Updates" class TestBlogPostDetailView: diff --git a/cdhweb/blog/views.py b/cdhweb/blog/views.py index 4cb6b2e1e..0dd6a295e 100644 --- a/cdhweb/blog/views.py +++ b/cdhweb/blog/views.py @@ -33,6 +33,13 @@ class BlogIndexView(BlogPostArchiveMixin, ArchiveIndexView): '''Main blog post list view''' date_list_period = 'month' + def get_context_data(self, *args, **kwargs): + context = super().get_context_data(*args, **kwargs) + context.update({ + 'page_title': "Latest Updates" + }) + return context + class BlogYearArchiveView(BlogPostArchiveMixin, YearArchiveView): '''Blog post archive by year''' @@ -42,7 +49,7 @@ def get_context_data(self, *args, **kwargs): self).get_context_data(*args, **kwargs) context.update({ 'date_list': BlogPost.objects.dates(self.date_field, 'month', order='DESC'), - 'title': self.kwargs['year'] + 'page_title': '%s Updates' % self.kwargs['year'] }) return context @@ -58,7 +65,7 @@ def get_context_data(self, *args, **kwargs): date = datetime.strptime('%(year)s %(month)s' % self.kwargs, '%Y %m') context.update({ 'date_list': BlogPost.objects.dates(self.date_field, 'month', order='DESC'), - 'title': date.strftime('%B %Y') + 'page_title': '%s Updates' % date.strftime('%B %Y') }) return context diff --git a/cdhweb/events/templates/events/event_archive.html b/cdhweb/events/templates/events/event_archive.html index 5ab770aeb..7f26e1df4 100644 --- a/cdhweb/events/templates/events/event_archive.html +++ b/cdhweb/events/templates/events/event_archive.html @@ -1,16 +1,16 @@ {% extends "base.html" %} -{% block page-title %}{{ title|default:'Upcoming' }} Events{% endblock %} +{% block page-title %}{{ page_title }}{% endblock %} {% block bodyattrs %}class="with-cards"{% endblock %} {% block main %}
    -

    {{ title|default:'Upcoming' }} Events

    +

    {{ page_title }}

    {# drop-down nav adapted from person list pages #}
    - {{ title|default:'Upcoming' }} + {{ page_title }}
      {# include upcoming events page link #} diff --git a/cdhweb/events/views.py b/cdhweb/events/views.py index f103aed63..97e04ed8c 100644 --- a/cdhweb/events/views.py +++ b/cdhweb/events/views.py @@ -69,6 +69,7 @@ def get_context_data(self, *args, **kwargs): event_qs = context['events'] context.update({ 'events': event_qs.upcoming(), + 'page_title': 'Upcoming Events', # find 6 most recent past events 'past': event_qs.recent()[:6], 'date_list': self.get_semester_date_list() @@ -128,8 +129,8 @@ def get_context_data(self, *args, **kwargs): context = super(EventSemesterArchiveView, self).get_context_data(*args, **kwargs) context.update({ - 'title': '%s %s' % (self.kwargs['semester'].title(), - self.kwargs['year']) + 'page_title': '%s %s Events' % (self.kwargs['semester'].title(), + self.kwargs['year']) }) return context diff --git a/cdhweb/people/templates/people/person_list.html b/cdhweb/people/templates/people/person_list.html index 425326277..cf8f0fd3d 100644 --- a/cdhweb/people/templates/people/person_list.html +++ b/cdhweb/people/templates/people/person_list.html @@ -1,6 +1,6 @@ {% extends "base.html" %} -{% block page-title %}{{ title|default:"People" }}{% endblock %} +{% block page-title %}{{ page_title }}{% endblock %} {% block bodyattrs %}class="with-cards"{% endblock %} {% block main %} @@ -11,7 +11,7 @@

      {{ current_title }}

      {# drop-down nav adapted from events page #}
      - {{ title }} + {{ page_title }}
        {% for label, profile_url in archive_nav_urls %} diff --git a/cdhweb/people/views.py b/cdhweb/people/views.py index 0a4552b3f..b69da71b8 100644 --- a/cdhweb/people/views.py +++ b/cdhweb/people/views.py @@ -57,7 +57,7 @@ def get_context_data(self): context.update({ 'current': self.add_display_label(current), 'past': self.add_display_label(past), - 'title': self.page_title, + 'page_title': self.page_title, 'past_title': self.past_title, 'current_title': self.current_title or self.page_title, # use main title as default 'archive_nav_urls': [ diff --git a/cdhweb/projects/templates/projects/project_list.html b/cdhweb/projects/templates/projects/project_list.html index 28978eee3..fb6058027 100644 --- a/cdhweb/projects/templates/projects/project_list.html +++ b/cdhweb/projects/templates/projects/project_list.html @@ -1,16 +1,16 @@ {% extends "base.html" %} -{% block page-title %}{{ title|default:'Projects' }}{% endblock %} +{% block page-title %}{{ page_title|default:'Projects' }}{% endblock %} {% block bodyattrs %}class="with-cards"{% endblock %} {% block main %}
        -

        {{ title }}

        +

        {{ page_title }}

        {# drop-down nav adapted from person list pages #}
        - {{ title }} + {{ page_title }}
          {% for label, page_url in archive_nav_urls %} diff --git a/cdhweb/projects/tests/test_views.py b/cdhweb/projects/tests/test_views.py index 2d30d505c..813e233c7 100644 --- a/cdhweb/projects/tests/test_views.py +++ b/cdhweb/projects/tests/test_views.py @@ -19,7 +19,7 @@ def test_page_titles(self, rf, projects): view.dispatch(request) view.get_queryset() context = view.get_context_data(request=request) - assert context["title"] == "My Projects" + assert context["page_title"] == "My Projects" assert context["past_title"] == "My Past Projects" def test_archive_nav_urls(self, rf, projects): diff --git a/cdhweb/projects/views.py b/cdhweb/projects/views.py index 1177b3cf1..4ec2c4193 100644 --- a/cdhweb/projects/views.py +++ b/cdhweb/projects/views.py @@ -36,7 +36,7 @@ def get_context_data(self, *args, **kwargs): context.update({ "current": self.get_current(), "past": self.get_past(), - "title": self.page_title, + "page_title": self.page_title, "past_title": self.past_title, "archive_nav_urls": ( ("Sponsored Projects", reverse("projects:sponsored")), From 515df82b22de6e65d696fb70989ba8f0d3c1a252 Mon Sep 17 00:00:00 2001 From: Nick Budak Date: Mon, 29 Mar 2021 17:15:53 -0400 Subject: [PATCH 559/570] Reorder page title calculation logic in base template --- templates/base.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/base.html b/templates/base.html index 6bf98eeec..0023ddf0e 100644 --- a/templates/base.html +++ b/templates/base.html @@ -16,7 +16,7 @@ {% endif %} {% block title %} - {% block page-title %}{% firstof page.seo_title page.title page_title %}{% endblock %} – CDH@Princeton + {% block page-title %}{% firstof page_title page.seo_title page.title %}{% endblock %} – CDH@Princeton {% endblock %} {% if SHOW_TEST_WARNING %} {# test variant favicon to help differentiate test/prod sites #} From d91c128d09d480480fd6ec4829db9946e5cce976 Mon Sep 17 00:00:00 2001 From: Nick Budak Date: Mon, 29 Mar 2021 17:16:07 -0400 Subject: [PATCH 560/570] Add page intros as descriptions where present --- templates/snippets/head_meta.html | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/templates/snippets/head_meta.html b/templates/snippets/head_meta.html index 10bed4008..e447e251a 100644 --- a/templates/snippets/head_meta.html +++ b/templates/snippets/head_meta.html @@ -1,21 +1,23 @@ {% load static cdh_tags %} -{# html metadata #} +{% firstof preview_image page.get_url|url_to_icon_path default_preview_image as meta_preview_image %} +{% firstof page_title page.seo_title page.title as meta_title %} +{% firstof page.get_plaintext_description page_intro.paragraph as meta_description %} {% autoescape on %} +{# html metadata #} {% if page.tags.exists %}{% endif %} -{% if page.search_description %}{% endif %} +{% if meta_description %}{% endif %} {# determine preview image: specified by page, cdh icon based on url, or default image #} -{% firstof preview_image page.get_url|url_to_icon_path default_preview_image as meta_preview_image %} {# open graph metadata #} - + -{% if page.search_description %}{% endif %} - +{% if meta_description %}{% endif %} + {# twitter card #} - -{% if page.search_description %}{% endif %} + +{% if meta_description %}{% endif %} {% endautoescape %} From a809a7ee739b64b322efa74095e2129d39b1466b Mon Sep 17 00:00:00 2001 From: rlskoeser Date: Mon, 29 Mar 2021 18:14:26 -0400 Subject: [PATCH 561/570] Disable autoescaping when getting pageintro content for meta description --- templates/snippets/head_meta.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/templates/snippets/head_meta.html b/templates/snippets/head_meta.html index e447e251a..e9ebda1ee 100644 --- a/templates/snippets/head_meta.html +++ b/templates/snippets/head_meta.html @@ -1,7 +1,9 @@ {% load static cdh_tags %} {% firstof preview_image page.get_url|url_to_icon_path default_preview_image as meta_preview_image %} {% firstof page_title page.seo_title page.title as meta_title %} +{% autoescape off %} {% firstof page.get_plaintext_description page_intro.paragraph as meta_description %} +{% endautoescape %} {% autoescape on %} {# html metadata #} {% if page.tags.exists %}{% endif %} From 73303c52adb59720149549a250e74c4952b40f25 Mon Sep 17 00:00:00 2001 From: Nick Budak Date: Tue, 30 Mar 2021 09:03:47 -0400 Subject: [PATCH 562/570] Strip non-breaking spaces when creating PageIntros --- cdhweb/pages/exodus.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cdhweb/pages/exodus.py b/cdhweb/pages/exodus.py index 78c8eeff6..1c529f160 100644 --- a/cdhweb/pages/exodus.py +++ b/cdhweb/pages/exodus.py @@ -247,7 +247,7 @@ def create_link_page(page, parent): if page.richtextpage.content and \ not is_blank(page.richtextpage.content): PageIntro.objects.create(page=new_page, - paragraph=page.richtextpage.content) + paragraph=page.richtextpage.content.replace(" ", "")) return new_page From d03d887aac8c47c9491bb76a0ee27467aed53029 Mon Sep 17 00:00:00 2001 From: rlskoeser Date: Tue, 30 Mar 2021 09:08:39 -0400 Subject: [PATCH 563/570] Move error page templates back into mezzanine location for 3.0 release --- templates/{ => errors}/404.html | 0 templates/{ => errors}/500.html | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename templates/{ => errors}/404.html (100%) rename templates/{ => errors}/500.html (100%) diff --git a/templates/404.html b/templates/errors/404.html similarity index 100% rename from templates/404.html rename to templates/errors/404.html diff --git a/templates/500.html b/templates/errors/500.html similarity index 100% rename from templates/500.html rename to templates/errors/500.html From 254e0c3ae5ccc5a0951f115ee6cca55ac7e3ecc8 Mon Sep 17 00:00:00 2001 From: rlskoeser Date: Tue, 30 Mar 2021 09:20:39 -0400 Subject: [PATCH 564/570] Reference 404 template at mezzanine location for 3.0 release --- cdhweb/people/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cdhweb/people/views.py b/cdhweb/people/views.py index b69da71b8..4a0417a36 100644 --- a/cdhweb/people/views.py +++ b/cdhweb/people/views.py @@ -239,7 +239,7 @@ def get_context_data(self): def speakerlist_gone(request): # return 410 gone for speakers list view; # (removed in 3.0, no longer needed after the Year of Data) - return render(request, '404.html', context={ + return render(request, 'errors/404.html', context={ 'error_code': 410, 'message': "That page isn't here anymore." }, status=410) From 9c7a5f8fe22605e3323aeba8e42346af7ad991e8 Mon Sep 17 00:00:00 2001 From: Nick Budak Date: Tue, 30 Mar 2021 10:48:55 -0400 Subject: [PATCH 565/570] Set version to 3.0.0 --- cdhweb/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cdhweb/__init__.py b/cdhweb/__init__.py index 3ba3ad98f..fef7b2bf9 100644 --- a/cdhweb/__init__.py +++ b/cdhweb/__init__.py @@ -1,4 +1,4 @@ -__version_info__ = (3, 0, 0, "dev") +__version_info__ = (3, 0, 0, None) # Dot-connect all but the last. Last is dash-connected if not None. From c7c7ce3f40cf55adf8dc37cd1a598b99e2911ff2 Mon Sep 17 00:00:00 2001 From: Nick Budak Date: Tue, 30 Mar 2021 10:57:33 -0400 Subject: [PATCH 566/570] Update CHANGELOG for v3.0 --- CHANGELOG.rst | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 95037e5a9..46020560a 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,6 +1,40 @@ CHANGELOG ========= +3.0 +--- + +* As a moderator, I want to create and edit events in wagtail so that I can manage them just like other pages. +* As a moderator, I want to create and edit people in wagtail so that I can manage them just like pages. +* As an editor, I want to create and edit blog posts in wagtail so that I can take advantage of its editing capabilities. +* As an editor, I want upload and manage page attachments in wagtail so that I can associate them with pages. +* As an editor, I want existing attachments migrated to wagtail so that I can manage them in the new system. +* As a moderator, I want existing content pages migrated from mezzanine to wagtail so that I can manage them in the new system. +* As a moderator, I want existing uploaded images migrated to wagtail so that I can manage them in the new system. +* As a moderator, I want existing related links migrated to wagtail so that I can manage them in the new system. +* As an editor, I want existing blog posts migrated to wagtail so that I can manage them in the new system. +* As a moderator, I want existing projects migrated to wagtail so that I can manage them in the new system. +* As a moderator, I want existing events migrated to wagtail so that I can manage them in the new system. +* As a moderator, I want existing people migrated to wagtail so that I can manage them in the new system. +* As a moderator, I want People automatically organized into person list pages so I don't have to manually manage these pages. +* As a moderator, I want Projects automatically organized into list pages so I don't have to manually manage these pages. +* As a moderator, I want Events automatically organized by upcoming events and by semester, so that I don't have to manually manage these list pages. +* As a moderator, I want blog posts automatically listed by latest posts, by month, and by year so that I don't have to manually manage these pages. +* As a search engine, I want a sitemap of all pages on the CDH site so that I can index them for users to search. +* As an editor, I want to manage the menus displayed across the site in wagtail so that I can easily update them when needed. +* As an admin, I want to see the edit history for a page, including edits before the wagtail migration, so that I can see the history of edits to a page. +* chore: add apache rewrite rule to ansible for migrated media +* chore: Include DB diagrams in documentation +* chore: remove inactive user accounts +* chore: clean image EXIF metadata +* bugfix: superuser permissions required for editing content due to mezzanine site permissions +* bugfix: meta information for project pages is incorrect +* bugfix: Some past student profiles are displaying twice +* bugfix: slug logic doesn't ensure uniqueness +* bugfix: 500 error when trying to view admin blog post list if not superuser +* bugfix: working groups display on main project page + + 2.8.1 ----- From 298c8a9249f97882728c7226d2097d2ab745e710 Mon Sep 17 00:00:00 2001 From: Nick Budak Date: Tue, 30 Mar 2021 10:59:34 -0400 Subject: [PATCH 567/570] Update DEPLOYNOTES for v3 --- DEPLOYNOTES.rst | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/DEPLOYNOTES.rst b/DEPLOYNOTES.rst index 78816d455..64197aa0f 100644 --- a/DEPLOYNOTES.rst +++ b/DEPLOYNOTES.rst @@ -1,6 +1,12 @@ Deploy Notes ============ +3.0 +--- + +- After deployment, the main exodus script should be run to move content from + mezzanine to wagtail with `python manage.py exodus`. + 2.8.1 ----- From 1f184b5da6589d0ac1b9b460cd09581f67e5c42b Mon Sep 17 00:00:00 2001 From: Nick Budak Date: Tue, 30 Mar 2021 11:01:08 -0400 Subject: [PATCH 568/570] Audit js dependencies for v3 --- package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index c7d790ce7..0a9fe4037 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4035,9 +4035,9 @@ "dev": true }, "y18n": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz", - "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==" + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.1.tgz", + "integrity": "sha512-wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ==" }, "yallist": { "version": "2.1.2", From 44a6fc463469d8314e8f9977cda4b9eb62c127fa Mon Sep 17 00:00:00 2001 From: Nick Budak Date: Tue, 30 Mar 2021 11:07:59 -0400 Subject: [PATCH 569/570] Update docs for v3.0 --- docs/.buildinfo | 2 +- docs/_modules/cdhweb/blog/models.html | 168 +- docs/_modules/cdhweb/blog/views.html | 99 +- docs/_modules/cdhweb/events/models.html | 239 +- docs/_modules/cdhweb/events/views.html | 111 +- docs/_modules/cdhweb/people/models.html | 571 +++-- docs/_modules/cdhweb/people/views.html | 269 ++- docs/_modules/cdhweb/projects/models.html | 262 ++- docs/_modules/cdhweb/projects/views.html | 108 +- docs/_modules/cdhweb/resources/models.html | 49 +- .../django/db/models/query_utils.html | 464 ---- docs/_modules/django/utils/feedgenerator.html | 520 ----- docs/_modules/index.html | 7 +- docs/_sources/architecture.rst.txt | 6 +- docs/_static/basic.css | 2 +- docs/_static/doctools.js | 9 +- docs/_static/documentation_options.js | 2 +- docs/_static/language_data.js | 6 +- docs/_static/pygments.css | 8 +- docs/_static/searchtools.js | 28 +- docs/_static/underscore-1.12.0.js | 2027 +++++++++++++++++ docs/_static/underscore-1.3.1.js | 999 -------- docs/_static/underscore.js | 37 +- docs/architecture.html | 9 +- docs/changelog.html | 168 +- docs/codedocs.html | 1280 ++++++----- docs/deploynotes.html | 69 +- docs/genindex.html | 385 ++-- docs/index.html | 75 +- docs/objects.inv | Bin 1988 -> 2168 bytes docs/py-modindex.html | 5 +- docs/search.html | 6 +- docs/searchindex.js | 2 +- 33 files changed, 4493 insertions(+), 3499 deletions(-) delete mode 100644 docs/_modules/django/db/models/query_utils.html delete mode 100644 docs/_modules/django/utils/feedgenerator.html create mode 100644 docs/_static/underscore-1.12.0.js delete mode 100644 docs/_static/underscore-1.3.1.js diff --git a/docs/.buildinfo b/docs/.buildinfo index 3aba103d7..972f96af2 100644 --- a/docs/.buildinfo +++ b/docs/.buildinfo @@ -1,4 +1,4 @@ # Sphinx build info version 1 # This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done. -config: 3c89bab6b7044edeaa836c93b6a966f0 +config: 8cf55aa454ee68e1381bd40ba095d339 tags: 645f666f9bcd5a90fca523b33c5a78b7 diff --git a/docs/_modules/cdhweb/blog/models.html b/docs/_modules/cdhweb/blog/models.html index b10709d2f..b366f227b 100644 --- a/docs/_modules/cdhweb/blog/models.html +++ b/docs/_modules/cdhweb/blog/models.html @@ -5,14 +5,13 @@ - cdhweb.blog.models — CDH website 2.8.0 documentation + cdhweb.blog.models — CDH website 3.0.0 documentation - @@ -32,19 +31,29 @@

          Source code for cdhweb.blog.models

          -from django.db import models
+from django.contrib.auth.models import User
+from django.db import models
 from django.urls import reverse
-from django.utils.translation import ugettext_lazy as _
+from django.utils.dateformat import format
 from django.utils.text import Truncator
-
+from django.utils.translation import ugettext_lazy as _
 from mezzanine.core.fields import FileField
 from mezzanine.core.models import Displayable, RichText
 from mezzanine.utils.models import AdminThumbMixin, upload_to
-
+from modelcluster.contrib.taggit import ClusterTaggableManager
+from modelcluster.fields import ParentalKey
+from modelcluster.models import ClusterableModel
 from taggit.managers import TaggableManager
+from taggit.models import TaggedItemBase
+from wagtail.admin.edit_handlers import (FieldPanel, FieldRowPanel,
+                                         InlinePanel, MultiFieldPanel,
+                                         StreamFieldPanel)
+from wagtail.core.models import Orderable, Page, PageManager, PageQuerySet
+from wagtail.images.edit_handlers import ImageChooserPanel
 
-from cdhweb.people.models import Person
-from cdhweb.resources.models import Attachment, PublishedQuerySetMixin
+from cdhweb.pages.models import (BasePage, LinkPage,
+                                 PagePreviewDescriptionMixin)
+from cdhweb.resources.models import Attachment
 
 
 
          [docs]class MultiOwnable(models.Model):
@@ -54,8 +63,8 @@ 
          Source code for cdhweb.blog.models
               multiple owners.
     """
 
-    users = models.ManyToManyField(Person, verbose_name=_("Authors"),
-        related_name="%(class)ss")
+    users = models.ManyToManyField(User, verbose_name=_("Authors"),
+                                   related_name="%(class)ss")
 
     class Meta:
         abstract = True
@@ -73,18 +82,31 @@ 
          Source code for cdhweb.blog.models
               author_list.short_description = 'Authors'
          
 
 
-
          [docs]class BlogPostQuerySet(PublishedQuerySetMixin):
+
          [docs]class Author(Orderable):
+    """Ordered relationship between Person and BlogPost."""
+    post = ParentalKey("blog.BlogPost", related_name="authors")
+    person = models.ForeignKey("people.Person", on_delete=models.CASCADE)
+    panels = [FieldPanel("person")]
 
-
          [docs]    def featured(self):
-        '''return blog posts that are marked as featured'''
-        return self.filter(is_featured=True)
          
+    def __str__(self) -> str:
+        return "%s on %s" % (self.person, self.post)
          
+
+
+
          [docs]class BlogPostQuerySet(PageQuerySet):
 
 
          [docs]    def recent(self):
-        '''sort blog posts by publication date'''
-        return self.order_by('-publish_date')
          
+        """Order blog posts by date published."""
+        # NOTE we can't use ordering on the model to do this by default, so we
+        # have to make sure to call this method instead. See:
+        # https://docs.wagtail.io/en/stable/topics/pages.html#page-queryset-ordering
+        return self.order_by("-first_published_at")
          
+
+
          [docs]    def featured(self):
+        '''return blog posts that are marked as featured'''
+        return self.filter(featured=True)
          
 
 
-
          [docs]class BlogPost(Displayable, MultiOwnable, RichText, AdminThumbMixin):
+
          [docs]class OldBlogPost(Displayable, MultiOwnable, RichText, AdminThumbMixin):
     """
     A blog post with multiple authors. Based on
     :class:`mezzanine.blog.models.BlogPost`.
@@ -93,15 +115,16 @@ 
          Source code for cdhweb.blog.models
               # mezzanine blogpost has comments, categoriees, and ratings; do we
     # care about any of those?
     featured_image = FileField(verbose_name=_("Featured Image"),
-        upload_to=upload_to("blog.BlogPost.featured_image", "blog"),
-        help_text="Appears on the homepage carousel when post is featured.",
-        format="Image", max_length=255, null=True, blank=True)
+                               upload_to=upload_to(
+                                   "blog.BlogPost.featured_image", "blog"),
+                               help_text="Appears on the homepage carousel when post is featured.",
+                               format="Image", max_length=255, null=True, blank=True)
     related_posts = models.ManyToManyField("self",
-                                 verbose_name=_("Related posts"), blank=True)
+                                           verbose_name=_("Related posts"), blank=True)
     tags = TaggableManager(blank=True)
     attachments = models.ManyToManyField(Attachment, blank=True)
     is_featured = models.BooleanField(verbose_name=_("Featured"), default=False,
-                help_text="Feature the post in the carousel on the homepage.")
+                                      help_text="Feature the post in the carousel on the homepage.")
 
     admin_thumb_field = "featured_image"
 
@@ -123,7 +146,7 @@ 
          Source code for cdhweb.blog.models
                   verbose_name_plural = _("Blog posts")
         ordering = ("-publish_date",)
 
-
          [docs]    def get_absolute_url(self):
+
          [docs]    def get_absolute_url(self):
         # we don't have to worry about the various url config options
         # that mezzanine has to support; just handle the url style we
         # want to use locally
@@ -133,6 +156,103 @@ 
          Source code for cdhweb.blog.models
                       'month': '%02d' % self.publish_date.month,
             'day': '%02d' % self.publish_date.day,
             'slug': self.slug})
          
+
+
+# custom manager for wagtail pages, see:
+# https://docs.wagtail.io/en/stable/topics/pages.html#custom-page-managers
+BlogPostManager = PageManager.from_queryset(BlogPostQuerySet)
+
+
+
          [docs]class BlogPostTag(TaggedItemBase):
+    """Tags for Blog posts."""
+    content_object = ParentalKey(
+        "blog.BlogPost", on_delete=models.CASCADE, related_name="tagged_items")
          
+
+
+
          [docs]class BlogPost(BasePage, ClusterableModel, PagePreviewDescriptionMixin):
+    """A Blog post, implemented as a Wagtail page."""
+    featured_image = models.ForeignKey("wagtailimages.image", null=True, blank=True,
+                                       on_delete=models.SET_NULL, related_name="+",
+                                       help_text="Appears on the homepage carousel when post is featured.")
+    tags = ClusterTaggableManager(through=BlogPostTag, blank=True)
+    featured = models.BooleanField(
+        default=False, help_text="Show the post in the carousel on the homepage.")
+    # TODO attachments (#245)
+
+    # can only be created underneath special link page
+    parent_page_types = ["blog.BlogLinkPage"]
+    # no allowed subpages
+    subpage_types = []
+
+    # admin edit configuration
+    content_panels = Page.content_panels + [
+        FieldRowPanel((ImageChooserPanel("featured_image"),
+                       FieldPanel("featured"))),
+        MultiFieldPanel(
+            (InlinePanel("authors", label="Author"),), heading="Authors"),
+        StreamFieldPanel("body"),
+        StreamFieldPanel("attachments")
+    ]
+    promote_panels = Page.promote_panels + [
+        FieldPanel("tags")
+    ]
+
+    # custom manager/queryset logic
+    objects = BlogPostManager()
+
+    @property
+    def short_title(self):
+        """Shorter title with ellipsis."""
+        return Truncator(self.title).chars(65)
+
+    @property
+    def short_description(self):
+        """Shorter description with ellipsis."""
+        return Truncator(self.get_description()).chars(250)
+
+    @property
+    def author_list(self):
+        """Comma-separated list of author names."""
+        return ", ".join(str(author.person) for author in self.authors.all())
+
+    def __str__(self):
+        return "\"%s\" (%s)" % (self.short_title, format(self.first_published_at, "F j, Y"))
+
+
          [docs]    def get_url_parts(self, *args, **kwargs):
+        """Custom blog post URLs of the form /updates/2014/03/01/my-post."""
+        url_parts = super().get_url_parts(*args, **kwargs)
+        # NOTE evidently this can sometimes be None; unclear why – perhaps it
+        # gets called in a context where the request is unavailable? Only
+        # happens in QA, not locally.
+        if url_parts:
+            site_id, root_url, _ = url_parts
+            page_path = reverse("blog:detail", kwargs={
+                "year": self.first_published_at.year,
+                # force two-digit month and day
+                "month": "%02d" % self.first_published_at.month,
+                "day": "%02d" % self.first_published_at.day,
+                "slug": self.slug,
+            })
+            return site_id, root_url, page_path
          
+
+
          [docs]    def get_sitemap_urls(self, request):
+        """Override sitemap listings to add priority for featured posts."""
+        # output is a list of dict; there should only ever be one element. see:
+        # https://docs.wagtail.io/en/stable/reference/contrib/sitemaps.html#urls
+        urls = super().get_sitemap_urls(request=request)
+        if self.featured:
+            urls[0]["priority"] = 0.6   # default is 0.5; slight increase
+        return urls
          
+
+
+
          [docs]class BlogLinkPage(LinkPage):
+    """Container page that defines where blog posts can be created."""
+    # NOTE this page can't be created in the page editor; it is only ever made
+    # via a script or the console, since there's only one.
+    parent_page_types = []
+    # NOTE the only allowed child page type is a BlogPost; this is so that
+    # Events made in the admin automatically are created here.
+    subpage_types = [BlogPost]
          
 
          
 
           
          
@@ -217,7 +337,7 @@ 
          Quick search
          
       ©2017, CDH @ Princeton & Trustees of Princeton University.
       
       |
-      Powered by Sphinx 3.3.1
+      Powered by Sphinx 3.5.3
       & Alabaster 0.7.12
       
     
          
diff --git a/docs/_modules/cdhweb/blog/views.html b/docs/_modules/cdhweb/blog/views.html
index 3eeb0d66c..3508d2d24 100644
--- a/docs/_modules/cdhweb/blog/views.html
+++ b/docs/_modules/cdhweb/blog/views.html
@@ -5,14 +5,13 @@
   
     
     
-    cdhweb.blog.views — CDH website 2.8.0 documentation
+    cdhweb.blog.views — CDH website 3.0.0 documentation
     
     
     
     
     
     
-    
     
     
    
@@ -41,25 +40,23 @@ 
          Source code for cdhweb.blog.views
               MonthArchiveView
 
 from cdhweb.blog.models import BlogPost
-from cdhweb.resources.utils import absolutize_url
-from cdhweb.resources.views import LastModifiedMixin, LastModifiedListMixin
+from cdhweb.pages.views import LastModifiedMixin, LastModifiedListMixin
 
 
 
          [docs]class BlogPostMixinView(object):
-    '''View mixin that sets model to Blogpost and returns a
-    published BlogPost queryset.'''
+    """Mixin that sets model to BlogPost and orders/filters queryset."""
     model = BlogPost
+    lastmodified_attr = "last_published_at"
 
-    def get_queryset(self):
-        # use displayable manager to find published events only
-        # (or draft profiles for logged in users with permission to view)
-        return BlogPost.objects.published() # TODO: published(for_user=self.request.user)
          
+
          [docs]    def get_queryset(self):
+        """Return published posts with most recent first."""
+        return BlogPost.objects.live().recent()
          
 
 
 
          [docs]class BlogPostArchiveMixin(BlogPostMixinView, LastModifiedListMixin):
     '''Mixin with common settings for blogpost archive views'''
-    date_field = 'publish_date'
-    context_object_name = 'blogposts'
+    date_field = 'first_published_at'
+    context_object_name = 'posts'
     make_object_list = True
     paginate_by = 12
     template_name = 'blog/blogpost_archive.html'
          
@@ -67,17 +64,25 @@ 
          Source code for cdhweb.blog.views
           
 
          [docs]class BlogIndexView(BlogPostArchiveMixin, ArchiveIndexView):
     '''Main blog post list view'''
-    date_list_period = 'month'
          
+    date_list_period = 'month'
+
+
          [docs]    def get_context_data(self, *args, **kwargs):
+        context = super().get_context_data(*args, **kwargs)
+        context.update({
+            'page_title': "Latest Updates"
+        })
+        return context
          
 
 
 
          [docs]class BlogYearArchiveView(BlogPostArchiveMixin, YearArchiveView):
     '''Blog post archive by year'''
 
 
          [docs]    def get_context_data(self, *args, **kwargs):
-        context = super(BlogYearArchiveView, self).get_context_data(*args, **kwargs)
+        context = super(BlogYearArchiveView,
+                        self).get_context_data(*args, **kwargs)
         context.update({
-            'date_list': BlogPost.objects.dates('publish_date', 'month', order='DESC'),
-            'title': self.kwargs['year']
+            'date_list': BlogPost.objects.dates(self.date_field, 'month', order='DESC'),
+            'page_title': '%s Updates' % self.kwargs['year']
         })
         return context
          
 
@@ -87,12 +92,13 @@ 
          Source code for cdhweb.blog.views
               month_format = '%m'
 
 
          [docs]    def get_context_data(self, *args, **kwargs):
-        context = super(BlogMonthArchiveView, self).get_context_data(*args, **kwargs)
+        context = super(BlogMonthArchiveView,
+                        self).get_context_data(*args, **kwargs)
         # current requested month/year for display
         date = datetime.strptime('%(year)s %(month)s' % self.kwargs, '%Y %m')
         context.update({
-            'date_list': BlogPost.objects.dates('publish_date', 'month', order='DESC'),
-            'title': date.strftime('%B %Y')
+            'date_list': BlogPost.objects.dates(self.date_field, 'month', order='DESC'),
+            'page_title': '%s Updates' % date.strftime('%B %Y')
         })
         return context
          
 
@@ -100,14 +106,30 @@ 
          Source code for cdhweb.blog.views
           
          [docs]class BlogDetailView(BlogPostMixinView, DetailView, LastModifiedMixin):
     '''Blog post detail view'''
 
+    context_object_name = "page"
+
 
          [docs]    def get_context_data(self, *args, **kwargs):
+        """Add next/previous post to context."""
         context = super(BlogDetailView, self).get_context_data(*args, **kwargs)
-        # also set object as page for common page display functionality
+
+        # NOTE mezzanine Displayable previously handled this; we need to do it
+        # manually for Wagtail. See:
+        # http://mezzanine.jupo.org/docs/_modules/mezzanine/core/models.html#Displayable.get_next_by_publish_date
+        next = self.model.objects.filter(live=True,
+            first_published_at__gt=self.object.first_published_at).order_by("first_published_at")
+        if next.exists():
+            next = next[0]
+        else:
+            next = None
+        prev = self.model.objects.filter(live=True,
+            first_published_at__lt=self.object.first_published_at).order_by("-first_published_at")
+        if prev.exists():
+            prev = prev[0]
+        else:
+            prev = None
+
         context.update({
-            'page': self.object,
-            'opengraph_type': 'article',
-            'next': self.object.get_next_by_publish_date(),
-            'previous': self.object.get_previous_by_publish_date(),
+            'opengraph_type': 'article', 'next': next, 'previous': prev
         })
         return context
          
 
@@ -120,7 +142,7 @@ 
          Source code for cdhweb.blog.views
           
 
          [docs]    def items(self):
         '''ten most recent blog posts, ordered by publish date'''
-        return BlogPost.objects.published().order_by('-publish_date')[:10]
          
+        return BlogPost.objects.live().recent()[:10]
          
 
 
          [docs]    def item_title(self, item):
         '''blog post title'''
@@ -128,35 +150,38 @@ 
          Source code for cdhweb.blog.views
           
 
          [docs]    def item_description(self, item):
         '''blog post description, for feed content'''
-        return item.content
          
+        return item.get_description()
          
 
 
+        return item.get_full_url()
          
 
 
          [docs]    def item_author_name(self, item):
         '''author of the blog post; comma-separated list for multiple'''
-        return ', '.join([str(auth) for auth in item.users.all()])
          
+        return item.author_list
          
+
+
          [docs]    def item_author_email(self, item):
+        '''author email, if there is only one author'''
+        if item.authors.count() == 1:
+            return item.authors.first().person.email
          
 
 
+        if item.authors.count() == 1:
+            return item.authors.first().person.profile_url
          
 
 
          [docs]    def item_pubdate(self, item):
         '''publication date'''
-        return item.publish_date
          
+        return item.first_published_at
          
 
-
          [docs]    def item_updatedate(self, item):
+
          [docs]    def item_updateddate(self, item):
         '''last modified date'''
-        return item.updated
          
+        return item.last_published_at
          
 
 
          [docs]    def item_categories(self, item):
         '''keyword category terms'''
-        return [str(kw) for kw in item.keywords.all()]
          + return [str(tag) for tag in item.tags.all()]
        [docs]class AtomBlogPostFeed(RssBlogPostFeed): @@ -248,7 +273,7 @@

        Quick search

        ©2017, CDH @ Princeton & Trustees of Princeton University. | - Powered by Sphinx 3.3.1 + Powered by Sphinx 3.5.3 & Alabaster 0.7.12
        diff --git a/docs/_modules/cdhweb/events/models.html b/docs/_modules/cdhweb/events/models.html index e944dba27..bfa92d9b1 100644 --- a/docs/_modules/cdhweb/events/models.html +++ b/docs/_modules/cdhweb/events/models.html @@ -5,14 +5,13 @@ - cdhweb.events.models — CDH website 2.8.0 documentation + cdhweb.events.models — CDH website 3.0.0 documentation - @@ -37,6 +36,7 @@

        Source code for cdhweb.events.models

         from datetime import datetime
 
 import icalendar
+from django.contrib.auth.models import User
 from django.core.exceptions import ValidationError
 from django.db import models
 from django.urls import reverse
@@ -45,11 +45,19 @@ 
        Source code for cdhweb.events.models
         from mezzanine.core.fields import FileField
 from mezzanine.core.models import Displayable, RichText
 from mezzanine.utils.models import AdminThumbMixin, upload_to
+from modelcluster.contrib.taggit import ClusterTaggableManager
+from modelcluster.fields import ParentalKey
+from modelcluster.models import ClusterableModel
 from taggit.managers import TaggableManager
-
-from cdhweb.people.models import Person
-from cdhweb.resources.models import (Attachment, ExcerptMixin,
-                                     PublishedQuerySetMixin)
+from taggit.models import TaggedItemBase
+from wagtail.admin.edit_handlers import (FieldPanel, FieldRowPanel,
+                                         InlinePanel, MultiFieldPanel,
+                                         StreamFieldPanel)
+from wagtail.core.models import Page, PageManager, PageQuerySet
+from wagtail.images.edit_handlers import ImageChooserPanel
+
+from cdhweb.pages.models import LinkPage, BasePage
+from cdhweb.resources.models import Attachment, ExcerptMixin
 from cdhweb.resources.utils import absolutize_url
 
 
@@ -63,6 +71,9 @@ 
        Source code for cdhweb.events.models
         
     objects = EventTypeManager()
 
+    class Meta:
+        ordering = ("name",)
+
     def __str__(self):
         return self.name
 
@@ -82,6 +93,9 @@ 
        Source code for cdhweb.events.models
             def __str__(self):
         return self.short_name or self.name
 
+    class Meta:
+        ordering = ("name",)
+
     @property
     def display_name(self):
         '''A name for template display'''
@@ -95,7 +109,7 @@ 
        Source code for cdhweb.events.models
                     raise ValidationError("Address is required for non-virtual events")
        
 
 
-
        [docs]class EventQuerySet(PublishedQuerySetMixin):
+
        [docs]class EventQuerySet(PageQuerySet):
 
 
        [docs]    def upcoming(self):
         '''Find upcoming events. Includes events that end on the current
@@ -116,7 +130,7 @@ 
        Source code for cdhweb.events.models
                 return self.filter(end_time__lt=today).order_by('-start_time')
        
 
 
-
        [docs]class Event(Displayable, RichText, AdminThumbMixin, ExcerptMixin):
+
        [docs]class OldEvent(Displayable, RichText, AdminThumbMixin, ExcerptMixin):
     '''An event, such as a workshop, lecture, or conference.'''
 
     # description = rich text field
@@ -129,7 +143,7 @@ 
        Source code for cdhweb.events.models
             location = models.ForeignKey(Location, null=True, blank=True,
                                  on_delete=models.SET_NULL)
     event_type = models.ForeignKey(EventType, on_delete=models.CASCADE)
-    speakers = models.ManyToManyField(Person,
+    speakers = models.ManyToManyField(User,
                                       help_text='Guest lecturer(s) or Workshop leader(s)',
                                       blank=True)
 
@@ -166,7 +180,7 @@ 
        Source code for cdhweb.events.models
             class Meta:
         ordering = ("start_time",)
 
-
        [docs]    def is_virtual(self):
+
        [docs]    def is_virtual(self):
         '''If an event takes place in a virtual location, it is virtual'''
         if self.location:
             return self.location.is_virtual
@@ -174,7 +188,7 @@ 
        Source code for cdhweb.events.models
             is_virtual.boolean = True
     is_virtual.short_description = "Virtual"
 
-
        [docs]    def get_absolute_url(self):
+
        [docs]    def get_absolute_url(self):
         '''event detail url on this site'''
         # we don't have to worry about the various url config options
         # that mezzanine has to support; just handle the url style we
@@ -185,11 +199,11 @@ 
        Source code for cdhweb.events.models
                     'month': '%02d' % self.start_time.month,
             'slug': self.slug})
        
 
-
        [docs]    def full_url(self):
+
        [docs]    def full_url(self):
         '''Absolute url, including site address'''
         return absolutize_url(self.get_absolute_url())
        
 
-
        [docs]    def get_ical_url(self):
+
        [docs]    def get_ical_url(self):
         '''URL to download this event as ical'''
         return reverse('event:ical', kwargs={
             'year': self.start_time.year,
@@ -197,7 +211,7 @@ 
        Source code for cdhweb.events.models
                     'month': '%02d' % self.start_time.month,
             'slug': self.slug})
        
 
-
        [docs]    def when(self):
+
        [docs]    def when(self):
         '''Event start/end date and time, formatted for display.
         Removes leading zeros from hours and converts am/pm to lower case.'''
 
@@ -226,11 +240,11 @@ 
        Source code for cdhweb.events.models
         
         return ' – '.join([start, end])
        
 
-
        [docs]    def duration(self):
+
        [docs]    def duration(self):
         '''duration between start and end time as :class:`datetime.timedelta`'''
         return self.end_time - self.start_time
        
 
-
        [docs]    def ical_event(self):
+
        [docs]    def ical_event(self):
         '''Return the current event as a :class:`icalendar.Event` for
         inclusion in a :class:`icalendar.Calendar`'''
         event = icalendar.Event()
@@ -248,6 +262,197 @@ 
        Source code for cdhweb.events.models
                 event.add('description',
                   '\n'.join([strip_tags(self.content), '', absurl]))
         return event
        
+
+
+# custom manager for wagtail pages, see:
+# https://docs.wagtail.io/en/stable/topics/pages.html#custom-page-managers
+EventManager = PageManager.from_queryset(EventQuerySet)
+
+
+
        [docs]class EventTag(TaggedItemBase):
+    """Tags for Event pages."""
+    content_object = ParentalKey(
+        "events.Event", on_delete=models.CASCADE, related_name="tagged_items")
        
+
+
+
        [docs]class Speaker(models.Model):
+    """Relationship between Person and Event."""
+    event = ParentalKey("events.Event", related_name="speakers")
+    person = models.ForeignKey("people.Person", on_delete=models.CASCADE)
+    panels = [FieldPanel("person")]
+
+    class Meta:
+        ordering = ("person__last_name", "person__first_name")
+
+    def __str__(self) -> str:
+        return "%s at %s" % (self.person, self.event)
        
+
+
+
        [docs]class Event(BasePage, ClusterableModel):
+    """Page type for an event, such as a workshop, lecture, or conference."""
+
+    sponsor = models.CharField(max_length=80, null=True, blank=True)
+    start_time = models.DateTimeField()
+    end_time = models.DateTimeField()
+    location = models.ForeignKey(Location, null=True, blank=True,
+                                 on_delete=models.SET_NULL)
+    type = models.ForeignKey(EventType, null=True, on_delete=models.SET_NULL)
+    attendance = models.PositiveIntegerField(null=True, blank=True,
+                                             help_text="Total number of people who attended the event. (Internal only, for reporting purposes.)")
+    join_url = models.URLField(verbose_name="Join URL", null=True, blank=True,
+                               help_text="Join URL for virtual events, e.g. Zoom meetings.")
+    image = models.ForeignKey("wagtailimages.image", null=True, blank=True,
+                              on_delete=models.SET_NULL, related_name="+",
+                              help_text="Image for display on event detail page (optional)")
+    thumbnail = models.ForeignKey("wagtailimages.image", null=True, blank=True,
+                                  on_delete=models.SET_NULL, related_name="+",
+                                  help_text="Image for display on event card (optional)")
+    tags = ClusterTaggableManager(through=EventTag, blank=True)
+    # TODO attachments (#245)
+
+    # can only be created underneath special link page
+    parent_page_types = ["events.EventsLinkPage"]
+    # no allowed subpages
+    subpage_types = []
+
+    # admin edit configuration
+    content_panels = Page.content_panels + [
+        FieldPanel("type"),
+        FieldRowPanel((FieldPanel("start_time"),
+                       FieldPanel("end_time")), "Details"),
+        FieldPanel("location"),
+        FieldPanel("join_url"),
+        FieldRowPanel((FieldPanel("sponsor"),
+                       FieldPanel("attendance")), "Tracking"),
+        FieldRowPanel((ImageChooserPanel("thumbnail"),
+                       ImageChooserPanel("image")), "Images"),
+        MultiFieldPanel(
+            (InlinePanel("speakers", label="Speaker"),), heading="Speakers"),
+        StreamFieldPanel("body"),
+        StreamFieldPanel("attachments")
+    ]
+    promote_panels = Page.promote_panels + [
+        FieldPanel("tags")
+    ]
+
+    # custom manager/queryset logic
+    objects = EventManager()
+
+    class Meta:
+        ordering = ("-start_time",)
+
+    def __str__(self):
+        return " - ".join([self.title, self.start_time.strftime("%b %d, %Y")])
+
+    @property
+    def speaker_list(self):
+        """Comma-separated list of speaker names."""
+        return ", ".join(str(speaker.person) for speaker in self.speakers.all())
+
+
        [docs]    def clean(self):
+        """Validate that a type was specified for this event."""
+        # NOTE we can't cascade deletes to wagtail pages without corrupting the
+        # page tree. Instead, we use SET_NULL and a clean() handler so that we
+        # can make sure that it's impossible to create an Event without a type.
+        # More info: https://github.com/wagtail/wagtail/issues/1602
+        if not self.type:
+            raise ValidationError("Event must specify a type.")
        
+
+
        [docs]    def get_url_parts(self, *args, **kwargs):
+        """Custom event page URLs of the form /events/2014/03/my-event."""
+        url_parts = super().get_url_parts(*args, **kwargs)
+        # NOTE evidently this can sometimes be None; unclear why – perhaps it
+        # gets called in a context where the request is unavailable? Only
+        # happens in QA, not locally.
+        if url_parts:
+            site_id, root_url, _ = url_parts
+            page_path = reverse("events:detail", kwargs={
+                "year": self.start_time.year,
+                # force two-digit month
+                "month": "%02d" % self.start_time.month,
+                "slug": self.slug,
+            })
+            return site_id, root_url, page_path
        
+
+
        [docs]    def get_ical_url(self):
+        """URL to download this event as a .ics (iCal) file."""
+        return reverse('events:ical', kwargs={
+            'year': self.start_time.year,
+            # force two-digit month
+            'month': '%02d' % self.start_time.month,
+            'slug': self.slug})
        
+
+
        [docs]    def is_virtual(self):
+        """If an event takes place in a virtual location, it is virtual"""
+        if self.location:
+            return self.location.is_virtual
+        return False
        
+    is_virtual.boolean = True
+    is_virtual.short_description = "Virtual"
+
+
        [docs]    def when(self):
+        """Event start/end date and time, formatted for display.
+
+        Removes leading zeros from hours and converts am/pm to lower case.
+        """
+
+        # NOTE: - in %-I is to remove leading zero
+        # (possibly platform specific?)
+
+        local_tz = timezone.get_default_timezone()
+        # convert dates to local timezone for display
+        local_start = self.start_time.astimezone(local_tz)
+        local_end = self.end_time.astimezone(local_tz)
+        start = " ".join([local_start.strftime("%b %d"),
+                          local_start.strftime("%-I:%M")])
+        start_ampm = local_start.strftime("%p")
+        # include start am/pm if *different* from end
+        if start_ampm != local_end.strftime("%p"):
+            start += " %s" % start_ampm.lower()
+
+        # include end month and day if *different* from start
+        end_pieces = []
+        if local_start.month != local_end.month:
+            end_pieces.append(local_end.strftime("%b %d"))
+        elif local_start.day != local_end.day:
+            end_pieces.append(local_end.strftime("%d"))
+        end_pieces.append(local_end.strftime("%-I:%M %p").lower())
+        end = " ".join(end_pieces)
+
+        return " – ".join([start, end])
        
+
+
        [docs]    def duration(self):
+        """duration between start and end time as :class:`datetime.timedelta`"""
+        return self.end_time - self.start_time
        
+
+
        [docs]    def ical_event(self):
+        """Return the current event as a :class:`icalendar.Event` for
+        inclusion in a :class:`icalendar.Calendar`"""
+        event = icalendar.Event()
+        # use absolute url for event id and in event content
+        absurl = self.get_full_url()
+        event.add("uid", absurl)
+        event.add("summary", self.title)
+        event.add("dtstart", self.start_time)
+        event.add("dtend", self.end_time)
+        if self.location:
+            if self.is_virtual() and self.join_url:
+                event.add("location", self.join_url)
+            else:
+                event.add("location", self.location.display_name)
+        event.add("description",
+                  "\n".join([strip_tags(self.body), "", absurl]))
+        return event
        
+
+
+
        [docs]class EventsLinkPage(LinkPage):
+    """Container page that defines where Project pages can be created."""
+    # NOTE this page can't be created in the page editor; it is only ever made
+    # via a script or the console, since there's only one.
+    parent_page_types = []
+    # NOTE the only allowed child page type is an Event; this is so that
+    # Events made in the admin automatically are created here.
+    subpage_types = [Event]
        
 
        
 
           
        
@@ -332,7 +537,7 @@ 
        Quick search
        
       ©2017, CDH @ Princeton & Trustees of Princeton University.
       
       |
-      Powered by Sphinx 3.3.1
+      Powered by Sphinx 3.5.3
       & Alabaster 0.7.12
       
     
        
diff --git a/docs/_modules/cdhweb/events/views.html b/docs/_modules/cdhweb/events/views.html
index 5397a17ae..576e7e602 100644
--- a/docs/_modules/cdhweb/events/views.html
+++ b/docs/_modules/cdhweb/events/views.html
@@ -5,14 +5,13 @@
   
     
     
-    cdhweb.events.views — CDH website 2.8.0 documentation
+    cdhweb.events.views — CDH website 3.0.0 documentation
     
     
     
     
     
     
-    
     
     
    
@@ -34,55 +33,53 @@
   
        Source code for cdhweb.events.views
         import datetime
 
-from django.conf import settings
-from django.http import HttpResponse, Http404
-from django.views.generic.base import RedirectView
+import icalendar
+from django.http import Http404, HttpResponse
+from django.utils import timezone
 from django.views.generic.dates import ArchiveIndexView, YearArchiveView
 from django.views.generic.detail import DetailView
-from django.shortcuts import get_object_or_404
-from django.utils import timezone
-import icalendar
 
 from cdhweb.events.models import Event
-from cdhweb.resources.views import LastModifiedMixin, LastModifiedListMixin
-from cdhweb.resources.utils import absolutize_url
+from cdhweb.pages.views import LastModifiedListMixin, LastModifiedMixin
 
 
-
        [docs]class EventMixinView(object):
+
        [docs]class EventMixinView:
     '''View mixin that sets model to Event and returns a
     published Event queryset.'''
     model = Event
+    lastmodified_attr = "last_published_at"
 
 
        [docs]    def get_queryset(self):
-        '''use displayable manager to find published events only'''
-        # (or draft profiles for logged in users with permission to view)
-        return Event.objects.published() # TODO: published(for_user=self.request.user)
        
+        '''use manager to find published events only'''
+        return Event.objects.live()
        
 
 
-
        [docs]class EventSemesterDates(object):
+
        [docs]class EventSemesterDates:
     '''Mixin to return list of event semester dates based on
     event dates in the system.'''
 
+
        [docs]    @staticmethod
+    def get_semester(date):
+        """Return the semester a date occurs in as a string."""
+        # determine semester based on the month
+        if date.month <= 5:
+            return "Spring"
+        if date.month <= 8:
+            return "Summer"
+        return "Fall"
        
+
 
        [docs]    def get_semester_date_list(self):
         '''Get a list of semester labels (semester and year) for published
         events. Semesters are Spring (through May), Summer (through
         August), and Fall.'''
         date_list = []
-        dates = Event.objects.published() \
-                     .dates('start_time', 'month', order='ASC')
+        dates = Event.objects.live().dates('start_time', 'month', order='ASC')
         for date in dates:
-            # determine semester based on the month
-            if date.month <= 5:
-                semester = 'Spring'
-            elif date.month <= 8:
-                semester = 'Summer'
-            else:
-                semester = 'Fall'
-
             # add semester + year to list if not already present
-            sem_date = (semester, date.year)
+            sem_date = (self.get_semester(date), date.year)
             if sem_date not in date_list:
                 date_list.append(sem_date)
+
         return date_list
        
 
 
@@ -100,10 +97,12 @@ 
        Source code for cdhweb.events.views
             # that affects the archive date list as well; restricting to upcoming
     # events in get_context_data instaed
 
        [docs]    def get_context_data(self, *args, **kwargs):
-        context = super(UpcomingEventsView, self).get_context_data(*args, **kwargs)
+        context = super(UpcomingEventsView, self).get_context_data(
+            *args, **kwargs)
         event_qs = context['events']
         context.update({
             'events': event_qs.upcoming(),
+            'page_title': 'Upcoming Events',
             # find 6 most recent past events
             'past': event_qs.recent()[:6],
             'date_list': self.get_semester_date_list()
@@ -115,7 +114,8 @@ 
        Source code for cdhweb.events.views
                 upcoming = self.get_queryset().upcoming()
         # don't error if there are no upcoming events
         if upcoming.exists():
-            return upcoming.order_by('updated').first().updated
        
+            return getattr(upcoming.order_by(self.lastmodified_attr).first(),
+                           self.lastmodified_attr)
        
 
 
 
        [docs]class EventSemesterArchiveView(EventMixinView, YearArchiveView,
@@ -147,10 +147,10 @@ 
        Source code for cdhweb.events.views
                 # generate dates for start and end with current year
         month, year = self.semester_dates[semester]['start']
         start = datetime.datetime(int(self.kwargs['year']), month, year,
-            tzinfo=timezone.get_default_timezone())
+                                  tzinfo=timezone.get_default_timezone())
         month, year = self.semester_dates[semester]['end']
         end = datetime.datetime(int(self.kwargs['year']), month, year,
-            tzinfo=timezone.get_default_timezone())
+                                tzinfo=timezone.get_default_timezone())
         items = items.filter(start_time__gte=start, start_time__lte=end)
 
         return (date_list, items, context)
        
@@ -159,10 +159,11 @@ 
        Source code for cdhweb.events.views
                 return self.get_semester_date_list()
        
 
 
        [docs]    def get_context_data(self, *args, **kwargs):
-        context = super(EventSemesterArchiveView, self).get_context_data(*args, **kwargs)
+        context = super(EventSemesterArchiveView,
+                        self).get_context_data(*args, **kwargs)
         context.update({
-            'title': '%s %s' % (self.kwargs['semester'].title(),
-                                self.kwargs['year'])
+            'page_title': '%s %s Events' % (self.kwargs['semester'].title(),
+                                            self.kwargs['year'])
         })
         return context
        
 
@@ -172,10 +173,10 @@ 
        Source code for cdhweb.events.views
         
 
        [docs]    def get_object(self, queryset=None):
         if queryset is None:
-            queryset = self.get_queryset()
+            queryset = self.get_queryset().live()
         queryset = queryset.filter(slug=self.kwargs['slug'],
-                start_time__year=self.kwargs['year'],
-                start_time__month=self.kwargs['month'])
+                                   start_time__year=self.kwargs['year'],
+                                   start_time__month=self.kwargs['month'])
         try:
             # Get the single item from the filtered queryset
             obj = queryset.get()
@@ -183,42 +184,21 @@ 
        Source code for cdhweb.events.views
                     raise Http404("No Event found found matching the query")
         return obj
        
 
-
        [docs]    def get_context_data(self, *args, **kwargs):
-        context = super(EventDetailView, self).get_context_data(*args, **kwargs)
-        # also set object as page for common page display functionality
-        context['page'] = self.object
-        if self.object.image or self.object.image:
-            context.update({
-                'twitter_card_type': 'summary_large_image',
-                # generic preview image - prefer thumbnail'
-                'preview_image': absolutize_url(''.join([settings.MEDIA_URL,
-                    str(self.object.thumb or self.object.image)])),
-                # larger image - prefer fullsize
-                'twitter_image': absolutize_url(''.join([settings.MEDIA_URL,
-                    str(self.object.image or self.object.thumb)])),
-            })
-        return context
        
-
-
-
        [docs]class EventRedirectView(RedirectView):
-    '''Redirect from CDH website v1.0 pk-based urls to new date + slug urls'''
-    permanent = True
-    query_string = False
-
-
        [docs]    def get_redirect_url(self, *args, **kwargs):
-        event = get_object_or_404(Event, pk=kwargs['pk'])
-        return event.get_absolute_url()
        
+
        [docs]    def get(self, request, *args, **kwargs):
+        """Serve the requested Event using Wagtail's `Page.serve()`."""
+        return self.get_object().serve(request)
        
 
 
 
        [docs]class EventIcalView(EventDetailView):
     '''Download event information as ical'''
 
-
        [docs]    def render_to_response(self, context, **response_kwargs):
+
        [docs]    def get(self, request, *args, **kwargs):
+        event = self.get_object()
         cal = icalendar.Calendar()
-        cal.add_component(self.object.ical_event())
+        cal.add_component(event.ical_event())
         response = HttpResponse(cal.to_ical(), content_type="text/calendar")
         response['Content-Disposition'] = 'attachment; filename="%s.ics"' \
-            % self.object.slug
+            % event.slug
         return response
        
 
 
@@ -240,7 +220,6 @@ 
        Source code for cdhweb.events.views
         #         response = HttpResponse(cal.to_ical(), content_type="text/calendar")
 #         response['Content-Disposition'] = 'attachment; filename="CDH-calendar.ics"'
 #         return response
-
 
        
 
           
        
@@ -325,7 +304,7 @@ 
        Quick search
        
       ©2017, CDH @ Princeton & Trustees of Princeton University.
       
       |
-      Powered by Sphinx 3.3.1
+      Powered by Sphinx 3.5.3
       & Alabaster 0.7.12
       
     
        
diff --git a/docs/_modules/cdhweb/people/models.html b/docs/_modules/cdhweb/people/models.html
index a3e43f8a2..6732baa93 100644
--- a/docs/_modules/cdhweb/people/models.html
+++ b/docs/_modules/cdhweb/people/models.html
@@ -5,14 +5,13 @@
   
     
     
-    cdhweb.people.models — CDH website 2.8.0 documentation
+    cdhweb.people.models — CDH website 3.0.0 documentation
     
     
     
     
     
     
-    
     
     
    
@@ -35,19 +34,29 @@ 
        Source code for cdhweb.people.models
         from datetime import date
 
 from django.contrib.auth.models import User
-from django.core.exceptions import ObjectDoesNotExist
+from django.core.exceptions import ValidationError
 from django.db import models
+from django.db.models.signals import pre_delete
+from django.dispatch import receiver
 from django.urls import reverse
 from django.utils import timezone
-from django.utils.text import slugify
-from mezzanine.core.fields import FileField, RichTextField
-from mezzanine.core.models import (CONTENT_STATUS_DRAFT,
-                                   CONTENT_STATUS_PUBLISHED, Displayable)
+from mezzanine.core.fields import FileField
+from mezzanine.core.fields import RichTextField as MezzanineRichTextField
+from mezzanine.core.models import Displayable
 from mezzanine.utils.models import AdminThumbMixin, upload_to
+from modelcluster.fields import ParentalKey
+from modelcluster.models import ClusterableModel
 from taggit.managers import TaggableManager
+from wagtail.admin.edit_handlers import (FieldPanel, FieldRowPanel,
+                                         InlinePanel, MultiFieldPanel,
+                                         StreamFieldPanel)
+from wagtail.core.fields import RichTextField
+from wagtail.core.models import Page
+from wagtail.images.edit_handlers import ImageChooserPanel
 
-from cdhweb.resources.models import (Attachment, DateRange,
-                                     PublishedQuerySetMixin)
+from cdhweb.pages.models import (PARAGRAPH_FEATURES, BasePage,
+                                 LandingPage, LinkPage, RelatedLink)
+from cdhweb.resources.models import Attachment, DateRange
 
 
 
        [docs]class Title(models.Model):
@@ -55,10 +64,7 @@ 
        Source code for cdhweb.people.models
             title = models.CharField(max_length=255, unique=True)
     sort_order = models.PositiveIntegerField(default=0, blank=False,
                                              null=False)
-    # NOTE: defining relationship here because we can't add it to User
-    # directly
-    positions = models.ManyToManyField(User, through='Position',
-                                       related_name='titles')
+    positions = models.ManyToManyField("people.Person", through='Position')
 
     class Meta:
         ordering = ['sort_order']
@@ -73,103 +79,7 @@ 
        Source code for cdhweb.people.models
             num_people.short_description = '# People'
        
 
 
-
        [docs]class Person(User):
-    # NOTE: using a proxy model for User so we can customize the
-    # admin interface in one place without having to extend the django
-    # default user model.
-
-    class Meta:
-        proxy = True
-        verbose_name_plural = 'People'
-
-    @property
-    def current_title(self):
-        current_positions = self.positions.filter(end_date__isnull=True)
-        if current_positions.exists():
-            return current_positions.first().title
-
-
        [docs]    def cdh_staff(self):
-        '''is CDH staff'''
-        try:
-            return self.profile.is_staff
-        except ObjectDoesNotExist:
-            return False
        
-    cdh_staff.boolean = True
-    cdh_staff.short_description = 'CDH Staff'
-
-
        [docs]    def published(self):
-        '''person has a published profile page'''
-        try:
-            return self.profile.published()
-        except ObjectDoesNotExist:
-            return False
        
-    published.boolean = True
-
-
        [docs]    def get_absolute_url(self):
-        ''''Display url for user profile'''
-        try:
-            return self.profile.get_absolute_url()
-        except ObjectDoesNotExist:
-            pass
        
-
-    @property
-    def website_url(self):
-        '''personal website url, if set'''
-        website = self.userresource_set \
-            .filter(resource_type__name='Website').first()
-        if website:
-            return website.url
-
-    @property
-    def profile_url(self):
-        '''local profile url, user has a profile, or website url if there is one'''
-        try:
-            if self.profile.is_staff and self.published():
-                return self.get_absolute_url()
-        except ObjectDoesNotExist:
-            pass
-
-        return self.website_url
-
-    @property
-    def latest_grant(self):
-        '''most recent grants where this person has director role'''
-        # find projects where they are director, then get newest grant
-        # that overlaps with their directorship dates
-        mship = self.membership_set \
-            .filter(role__title__in=ProfileQuerySet.director_roles) \
-            .order_by('-start_date').first()
-        # if there is one, find the most recent grant overlapping with their
-        # directorship dates
-        if mship:
-            # find most recent grant that overlaps with membership dates
-            # - grant start before membership end OR
-            #   grant end after membership start
-
-            # a membership might have no end date set, in which
-            # case it can't be used in a filter
-            grant_overlap = models.Q(end_date__gte=mship.start_date)
-            if mship.end_date:
-                grant_overlap |= models.Q(start_date__lte=mship.end_date)
-
-            return mship.project.grant_set \
-                .filter(grant_overlap) \
-                .order_by('-start_date').first()
-
-    def __str__(self):
-        '''Custom person display to make it easier to choose people
-        in admin menus.  Uses profile title if available, otherwise combines
-        first and last names.  Returns username as last resort if no
-        names are set.'''
-        try:
-            return self.profile.title
-        except ObjectDoesNotExist:
-            if self.first_name or self.last_name:
-                return ' '.join([self.first_name, self.last_name]).strip()
-            return self.username
        
-
-
-
        [docs]class ProfileQuerySet(PublishedQuerySetMixin):
+
        [docs]class PersonQuerySet(models.QuerySet):
 
     #: position titles that indicate a person is a postdoc
     postdoc_titles = ['Postdoctoral Fellow',
@@ -182,7 +92,8 @@ 
        Source code for cdhweb.people.models
             student_titles = ['Graduate Fellow', 'Graduate Assistant',
                       'Undergraduate Assistant',
                       'Postgraduate Research Associate']
-    #: memebership roles that indicate someone is an affiliate
+
+    #: membership roles that indicate someone is an affiliate
     project_roles = ['Project Director',
                      'Project Manager', 'Co-PI: Research Lead']
 
@@ -194,45 +105,45 @@ 
        Source code for cdhweb.people.models
             with_exec_title = 'Sits with Executive Committee'
     exec_committee_titles = [exec_member_title, with_exec_title]
 
-
        [docs]    def staff(self):
+
        [docs]    def cdh_staff(self):
         '''Return only CDH staff members'''
-        return self.filter(is_staff=True)
        
+        return self.filter(cdh_staff=True)
        
 
-
        [docs]    def student_affiliates(self):
+
        [docs]    def student_affiliates(self):
         '''Return CDH student staff members, grantees, and PGRAs based on
         Project Director or Project Manager role.'''
         return self \
             .filter(models.Q(pu_status__in=self.student_pu_status) |
-                    models.Q(user__positions__title__title__in=self.student_titles)) \
-            .filter(models.Q(is_staff=True) |
-                    models.Q(user__membership__role__title__in=self.project_roles)) \
+                    models.Q(positions__title__title__in=self.student_titles)) \
+            .filter(models.Q(cdh_staff=True) |
+                    models.Q(membership__role__title__in=self.project_roles)) \
             .exclude(pu_status="stf")
        
 
-
        [docs]    def not_students(self):
+
        [docs]    def not_students(self):
         '''Filter out students based on PU status'''
         return self \
             .exclude(pu_status__in=self.student_pu_status)
        
 
-
        [docs]    def affiliates(self):
+
        [docs]    def affiliates(self):
         '''Faculty and staff affiliates based on PU status and Project Director
         project role. Excludes CDH staff.'''
         return self.filter(pu_status__in=('fac', 'stf'),
-                           user__membership__role__title__in=self.director_roles) \
-            .exclude(is_staff=True)
        
+                           membership__role__title__in=self.director_roles) \
+            .exclude(cdh_staff=True)
        
 
-
        [docs]    def executive_committee(self):
+
        [docs]    def executive_committee(self):
         '''Executive committee members; based on position title.'''
-        return self.filter(user__positions__title__title__in=self.exec_committee_titles)
        
+        return self.filter(positions__title__title__in=self.exec_committee_titles)
        
 
-
        [docs]    def exec_member(self):
+
        [docs]    def exec_member(self):
         '''Executive committee members'''
-        return self.filter(user__positions__title__title=self.exec_member_title)
        
+        return self.filter(positions__title__title=self.exec_member_title)
        
 
-
        [docs]    def sits_with_exec(self):
+
        [docs]    def sits_with_exec(self):
         '''Non-faculty Executive committee members'''
-        return self.filter(user__positions__title__title=self.with_exec_title)
        
+        return self.filter(positions__title__title=self.with_exec_title)
        
 
-
        [docs]    def grant_years(self):
+
        [docs]    def grant_years(self):
         '''Annotate with first start and last end grant year for grants
         that a person was project director.'''
         # NOTE: filters within the aggregation query on project director
@@ -240,13 +151,13 @@ 
        Source code for cdhweb.people.models
                 # page student staff without grants are still included
         return self.annotate(
             first_start=models.Min(models.Case(
-                models.When(user__membership__role__title__in=self.director_roles,
-                            then='user__membership__start_date'))),
+                models.When(membership__role__title__in=self.director_roles,
+                            then='membership__start_date'))),
             last_end=models.Max(models.Case(
-                models.When(user__membership__role__title__in=self.director_roles,
-                            then='user__membership__end_date'))))
        
+                models.When(membership__role__title__in=self.director_roles,
+                            then='membership__end_date'))))
        
 
-
        [docs]    def project_manager_years(self):
+
        [docs]    def project_manager_years(self):
         '''Annotate with first start and last end grant year for grants
         that a person was project manager.'''
         # NOTE: filters within the aggregation query on project manager
@@ -254,26 +165,19 @@ 
        Source code for cdhweb.people.models
                 # page student staff without grants are still included
         return self.annotate(
             pm_start=models.Min(models.Case(
-                models.When(user__membership__role__title='Project Manager',
-                            then='user__membership__start_date'))),
+                models.When(membership__role__title='Project Manager',
+                            then='membership__start_date'))),
             pm_end=models.Max(models.Case(
-                models.When(user__membership__role__title='Project Manager',
-                            then='user__membership__end_date'))))
        
-
-
        [docs]    def speakers(self):
-        '''Return external speakers at CDH events.'''
-        # Speakers are non-Princeton profiles (external) who are associated with
-        # at least one published event
-        return self.filter(user__event__isnull=False, pu_status='external',
-                           user__event__status=CONTENT_STATUS_PUBLISHED)
        
+                models.When(membership__role__title='Project Manager',
+                            then='membership__end_date'))))
        
 
     def _current_position_query(self):
-        # query to find a user with a current cdh position
-        # user *has* a position and it has no end date or date after today
+        # query to find a person with a current cdh position
+        # person *has* a position and it has no end date or date after today
         return (
-            models.Q(user__positions__isnull=False) &
-            (models.Q(user__positions__end_date__isnull=True) |
-             models.Q(user__positions__end_date__gte=date.today())
+            models.Q(positions__isnull=False) &
+            (models.Q(positions__end_date__isnull=True) |
+             models.Q(positions__end_date__gte=date.today())
              )
         )
 
@@ -281,18 +185,18 @@ 
        Source code for cdhweb.people.models
                 today = timezone.now()
         return (
             # in one of the allowed roles (project director/project manager)
-            models.Q(user__membership__role__title__in=self.project_roles) &
+            models.Q(membership__role__title__in=self.project_roles) &
             # current based on membership dates
             (
-                models.Q(user__membership__start_date__lte=today) &
-                (models.Q(user__membership__end_date__gte=today) |
-                 models.Q(user__membership__end_date__isnull=True))
+                models.Q(membership__start_date__lte=today) &
+                (models.Q(membership__end_date__gte=today) |
+                 models.Q(membership__end_date__isnull=True))
             )
         )
 
-
        [docs]    def current(self):
-        '''Return profiles for users with a current position or current grant
-        based on start and end dates.'''
+
        [docs]    def current(self):
+        '''Return people with a current position or current grant based on
+        start and end dates.'''
         # annotate with an is_current flag to make template logic simpler
         return self.filter(models.Q(self._current_position_query()) |
                            models.Q(self._current_project_member_query())) \
@@ -300,57 +204,204 @@ 
        Source code for cdhweb.people.models
                 # NOTE: couldn't get annotate to work
         # .annotate(is_current=models.Value(True, output_field=models.BooleanField))
 
-
        [docs]    def current_grant(self):
+
        [docs]    def current_grant(self):
         '''Return profiles for users with a current grant.'''
         return self.filter(self._current_project_member_query())
        
 
-
        [docs]    def current_position(self):
+
        [docs]    def current_position(self):
         '''Return profiles for users with a current position.'''
         return self.filter(self._current_position_query())
        
 
-
        [docs]    def current_position_nonexec(self):
+
        [docs]    def current_position_nonexec(self):
         '''Return profiles for users with a current position, excluding
         executive committee positions.'''
         return self.filter(models.Q(self._current_position_query()) &
-                           ~models.Q(user__positions__title__title__in=self.exec_committee_titles))
        
-
-
        [docs]    def has_upcoming_events(self):
-        '''Filter profiles to only those with an upcoming published event.'''
-        return self.filter(user__event__end_time__gte=timezone.now(),
-                           user__event__status=CONTENT_STATUS_PUBLISHED).distinct()
        
+                           ~models.Q(positions__title__title__in=self.exec_committee_titles))
        
 
-
        [docs]    def order_by_event(self):
-        '''Order by earliest published event associated with profile.'''
-        return self.annotate(
-            earliest_event=models.Min(models.Case(
-                models.When(user__event__status=CONTENT_STATUS_PUBLISHED,
-                            then='user__event__start_time')))
-        ).order_by('earliest_event')
        
-
-
        [docs]    def order_by_position(self):
+
        [docs]    def order_by_position(self):
         '''order by job title sort order and then by start date'''
         # annotate to avoid duplicates in the queryset due to multiple positions
         # sort on highest position title (= lowest number) and earliest start date (may
         # not be from the same position)
-        return self.annotate(min_title=models.Min('user__positions__title__sort_order'),
-                             min_start=models.Min('user__positions__start_date')) \
-            .order_by('min_title', 'min_start', 'user__last_name')
        
+        return self.annotate(min_title=models.Min('positions__title__sort_order'),
+                             min_start=models.Min('positions__start_date')) \
+            .order_by('min_title', 'min_start', 'last_name')
        
+
+
+
        [docs]class Person(ClusterableModel):
+    # in cdhweb 2.x this was a proxy model for User;
+    # in 3.x it is a distinct model with 1-1 optional relationship to User
+    first_name = models.CharField('first name', max_length=150)
+    last_name = models.CharField('last name', max_length=150)
+    email = models.EmailField(null=True, blank=True)
+    user = models.OneToOneField(
+        User,
+        on_delete=models.SET_NULL,
+        null=True,
+        blank=True,
+        help_text='Corresponding user account for this person (optional)'
+    )
+    cdh_staff = models.BooleanField(
+        'CDH Staff',
+        default=False,
+        help_text='CDH staff or Postdoctoral Fellow.')
+    job_title = models.CharField(
+        max_length=255, blank=True,
+        help_text='Professional title, e.g. Professor or Assistant Professor')
+    department = models.CharField(
+        max_length=255, blank=True,
+        help_text='Academic Department at Princeton or other institution')
+    institution = models.CharField(
+        max_length=255, blank=True,
+        help_text='Institutional affiliation (for people not associated with Princeton)')
+    phone_number = models.CharField(
+        max_length=50, blank=True, help_text="Office phone number")
+    office_location = models.CharField(
+        max_length=255, blank=True, help_text="Office number and building")
+    posts = models.ManyToManyField(to="blog.BlogPost", through="blog.Author")
+    events = models.ManyToManyField(to="events.Event", through="events.Speaker")
+
+    PU_STATUS_CHOICES = (
+        ('fac', 'Faculty'),
+        ('stf', 'Staff'),
+        ('graduate', 'Graduate Student'),
+        ('undergraduate', 'Undergraduate Student'),
+        ('external', 'Not associated with Princeton')
+    )
+    pu_status = models.CharField('Princeton Status', choices=PU_STATUS_CHOICES,
+                                 max_length=15, blank=True, default='')
+
+    image = models.ForeignKey('wagtailimages.image', null=True,
+                              blank=True, on_delete=models.SET_NULL,
+                              related_name='+')  # no reverse relationship
+
+    #: update timestamp
+    updated_at = models.DateTimeField(auto_now=True, null=True, editable=False)
+
+    # wagtail admin setup
+    panels = [
+        ImageChooserPanel("image"),
+        FieldRowPanel((FieldPanel("first_name"),
+                       FieldPanel("last_name")), "Name"),
+        FieldPanel("user"),
+        FieldRowPanel((FieldPanel("pu_status"),
+                       FieldPanel("cdh_staff")), "Status"),
+        MultiFieldPanel((
+            FieldPanel("job_title"),
+            FieldPanel("department"),
+            FieldPanel("institution"),
+        ), heading="Employment"),
+        MultiFieldPanel((
+            FieldPanel("phone_number"),
+            FieldPanel("email"),
+            FieldPanel("office_location"),
+        ), heading="Contact"),
+        InlinePanel("positions", heading="Positions"),
+        InlinePanel("related_links", heading="Related Links")
+    ]
+
+    # custom manager for querying
+    objects = PersonQuerySet.as_manager()
 
+    class Meta:
+        ordering = ("last_name",)
+        verbose_name_plural = "people"
+
+    def __str__(self):
+        """Person display for listing in admin menus. Uses first and last name
+        if set, otherwise falls back to username. If no user, uses pk as a last
+        resort."""
+        if self.first_name or self.last_name:
+            return " ".join([self.first_name, self.last_name]).strip()
+        if self.user:
+            return self.user.username
+        return "Person %d" % self.pk
+
+    def __lt__(self, other):
+        # NOTE we need to order Memberships using person name by default,
+        # but modelcluster doesn't support ordering via related lookups, so
+        # we can't order by person__last_name on Membership. Instead we do this.
+        # see: https://github.com/wagtail/django-modelcluster/issues/45
+        return str(self) < str(other)
 
-
        [docs]class Profile(Displayable, AdminThumbMixin):
-    user = models.OneToOneField(Person, on_delete=models.CASCADE)
+    @property
+    def current_title(self):
+        """Return the first of any non-expired titles held by this Person."""
+        current_positions = self.positions.filter(end_date__isnull=True)
+        if current_positions.exists():
+            return current_positions.first().title
+
+    @property
+    def most_recent_title(self):
+        """Return the most recent of any titles held by this Person."""
+        most_recent_position = self.positions.first()
+        if most_recent_position:
+            return most_recent_position.title
+
+    @property
+    def latest_grant(self):
+        '''most recent grants where this person has director role'''
+        # find projects where they are director, then get newest grant
+        # that overlaps with their directorship dates
+        mship = self.membership_set \
+            .filter(role__title__in=PersonQuerySet.director_roles) \
+            .order_by('-start_date').first()
+        # if there is one, find the most recent grant overlapping with their
+        # directorship dates
+        if mship:
+            # find most recent grant that overlaps with membership dates
+            # - grant start before membership end OR
+            #   grant end after membership start
+
+            # a membership might have no end date set, in which
+            # case it can't be used in a filter
+            grant_overlap = models.Q(end_date__gte=mship.start_date)
+            if mship.end_date:
+                grant_overlap |= models.Q(start_date__lte=mship.end_date)
+
+            return mship.project.grants \
+                .filter(grant_overlap) \
+                .order_by('-start_date').first()
+
+    @property
+    def profile_url(self):
+        """Provide the link to published profile on this site if there is one;
+        otherwise look for an associated website url"""
+        try:
+            profile = self.profile
+            if profile.live:
+                return profile.get_url()
+        except Profile.DoesNotExist:
+            website = self.related_links.filter(type__name="Website").first()
+            if website:
+                return website.url
+
+
        [docs]    @receiver(pre_delete, sender="people.Person")
+    def cleanup_profile(sender, **kwargs):
+        """Handler to delete the corresponding Profile on Person deletion."""
+        # see NOTE on Profile save() method
+        try:
+            Profile.objects.get(person=kwargs["instance"]).delete()
+        except Profile.DoesNotExist:
+            pass
        
+
+
+
        [docs]class OldProfile(Displayable, AdminThumbMixin):
+    user = models.OneToOneField(User, on_delete=models.CASCADE)
+    # -> cdh_staff on person
     is_staff = models.BooleanField(
         default=False,
         help_text='CDH staff or Postdoctoral Fellow. If checked, person ' +
         'will be listed on the CDH staff page and will have a profile page ' +
         'on the site.')
-    education = RichTextField()
-    bio = RichTextField()
+    education = MezzanineRichTextField()
+    bio = MezzanineRichTextField()
     # NOTE: could use regex here, but how standard are staff phone
     # numbers? or django-phonenumber-field, but that's probably overkill
     phone_number = models.CharField(max_length=50, blank=True)
     office_location = models.CharField(max_length=255, blank=True)
 
+    # moved to person
     job_title = models.CharField(
         max_length=255, blank=True,
         help_text='Professional title, e.g. Professor or Assistant Professor')
@@ -383,10 +434,10 @@ 
        Source code for cdhweb.people.models
         
     attachments = models.ManyToManyField(Attachment, blank=True)
 
+    # TODO: check for
     tags = TaggableManager(blank=True)
 
-    # custom manager for additional queryset filters
-    objects = ProfileQuerySet.as_manager()
+    # NOTE removed ProfileQuerySet manager here as it became PersonQuerySet
 
     class Meta:
         ordering = ["-user__last_name"]
@@ -396,7 +447,7 @@ 
        Source code for cdhweb.people.models
                 return self.title or \
             ' '.join([self.user.first_name, self.user.last_name])
 
-
        [docs]    def get_absolute_url(self):
+
        [docs]    def get_absolute_url(self):
         return reverse('people:profile', kwargs={'slug': self.slug})
        
 
     @property
@@ -405,73 +456,129 @@ 
        Source code for cdhweb.people.models
                 return self.user.current_title
        
 
 
+
        [docs]class Profile(BasePage):
+    """Profile page for a Person, managed via wagtail."""
+    person = models.OneToOneField(
+        Person, help_text="Corresponding person for this profile",
+        null=True, on_delete=models.SET_NULL)
+    image = models.ForeignKey('wagtailimages.image', null=True,
+                              blank=True, on_delete=models.SET_NULL,
+                              related_name='+')  # no reverse relationship
+    education = RichTextField(features=PARAGRAPH_FEATURES, blank=True)
+
+    # admin edit configuration
+    content_panels = Page.content_panels + [
+        FieldRowPanel(
+            (FieldPanel("person"), ImageChooserPanel("image")), "Person"),
+        FieldPanel("education"),
+        StreamFieldPanel("body"),
+        StreamFieldPanel("attachments")
+    ]
+
+    parent_page_types = ["people.PeopleLandingPage"]
+    subpage_types = []
+
+
        [docs]    def get_context(self, request):
+        """Add recent BlogPosts by this Person to their Profile."""
+        context = super().get_context(request)
+        # get 3 most recent published posts with this person as author;
+        # add to context and set open graph metadata
+        context.update({
+            "opengraph_type": "profile",
+            "recent_posts": self.person.posts.live().recent()[:3]
+        })
+        return context
        
+
+
        [docs]    def clean(self):
+        """Validate that a Person was specified for this profile."""
+        # NOTE we can't cascade deletes to wagtail pages without corrupting the
+        # page tree. Instead, we use SET_NULL, and then add a delete handler
+        # to Person to delete the corresponding profile manually. We still need
+        # to make sure that it's impossible to create a Profile without a
+        # corresponding Person. More info:
+        # https://github.com/wagtail/wagtail/issues/1602
+        if not self.person:
+            raise ValidationError("Profile page must be for existing person.")
        
+
+
+
        [docs]class PeopleLandingPage(LandingPage):
+    """LandingPage subtype for People that holds Profiles."""
+    # NOTE this page can't be created in the page editor; it is only ever made
+    # via a script or the console, since there's only one.
+    parent_page_types = []
+    # NOTE the only allowed child page type is a Profile; this is so that
+    # Profiles made in the admin automatically are created here.
+    subpage_types = [Profile, LinkPage]
+    # use the regular landing page template
+    template = LandingPage.template
        
+
+
 
        [docs]class Position(DateRange):
     '''Through model for many-to-many relation between people
     and titles.  Adds start and end dates to the join table.'''
-    user = models.ForeignKey(User, on_delete=models.CASCADE,
-                             related_name='positions')
+    person = ParentalKey(Person, on_delete=models.CASCADE,
+                         related_name="positions")
     title = models.ForeignKey(Title, on_delete=models.CASCADE)
 
     class Meta:
         ordering = ['-start_date']
 
     def __str__(self):
-        return '%s %s (%s)' % (self.user, self.title, self.start_date.year)
        
+        return '%s %s (%s)' % (self.person, self.title, self.start_date.year)
        
 
 
-
        [docs]def init_profile_from_ldap(user, ldapinfo):
-    '''Extra user/profile init logic for auto-populating people
-    profile fields with data available in LDAP.'''
+
        [docs]def init_person_from_ldap(user, ldapinfo):
+    '''Extra User init logic for creating and auto-populating a corresponding
+    Person with data from LDAP.'''
 
+    # update User to use ldap email
     user.email = user.email.lower()
     user.save()
 
-    try:
-        profile = user.profile
-    except ObjectDoesNotExist:
-        profile = Profile.objects.create(user=user)
-        # set profiles to draft by default when creating a new profile *only
-        # so we don't get a new page for every account we initialize
-        profile.status = CONTENT_STATUS_DRAFT
-
-    # populate profile with data we can pull from ldap
-    # but do not set any fields with content, which may contain edits
-
-    # - set user's display name as page title
-    if not profile.title:
-        profile.title = str(ldapinfo.displayName)
-    # - generate a slug based on display name
-    if not profile.slug:
-        profile.slug = slugify(ldapinfo.displayName)
-    if ldapinfo.telephoneNumber and not profile.phone_number:
-        profile.phone_number = str(ldapinfo.telephoneNumber)
-    # 'street' in ldap is office location
-    if ldapinfo.street and not profile.office_location:
-        profile.office_location = str(ldapinfo.street)
-    # organizational unit = department
-    if ldapinfo.ou and not profile.department:
-        profile.department = str(ldapinfo.ou)
-    # Store job title as string.
-    # NOTE: we may want to split title and only use the first portion.
-    # if ldapinfo.title and not profile.job_title:
-    profile.job_title = str(ldapinfo.title).split('.')[0]
+    # populate Person fields with data we can pull from ldap, if they are empty
+    person, _created = Person.objects.get_or_create(user=user)
+
+    # if no email set for Person, use ldap email
+    if not person.email:
+        person.email = user.email
+
+    # set first/last name basic on basic whitespace split; can adjust later
+    first_name, *_others, last_name = str(ldapinfo.displayName).split()
+    person.first_name = person.first_name or first_name
+    person.last_name = person.last_name or last_name
+
+    # set phone number
+    if ldapinfo.telephoneNumber and not person.phone_number:
+        person.phone_number = str(ldapinfo.telephoneNumber)
+
+    # set office location ("street" in ldap)
+    if ldapinfo.street and not person.office_location:
+        person.office_location = str(ldapinfo.street)
+
+    # set department (organizational unit or "ou" in ldap)
+    if ldapinfo.ou and not person.department:
+        person.department = str(ldapinfo.ou)
+
+    # set job title (split and use only first portion from ldap)
+    # NOTE titles for cdh staff are managed via Title/Position instead; we
+    # don't want to create Titles for every possible job at Princeton. This is
+    # a change from v2.x behavior.
+    if ldapinfo.title and not person.job_title:
+        person.job_title = str(ldapinfo.title).split(",")[0]
 
     # always update PU status to current
-    profile.pu_status = str(ldapinfo.pustatus)
+    person.pu_status = str(ldapinfo.pustatus)
+    person.save()
        
 
-    profile.save()
 
-    # NOTE: job title is available in LDAP; attaching to a person
-    # currently requires at least a start date (which is not available
-    # in LDAP), but we can at least ensure the title is defined
-    # so it can easily be associated with the person
+
+    def __str__(self):
+        return "%s – %s (%s)" % (self.person, self.type, self.display_url)
        
 
        
 
           
        
@@ -556,7 +663,7 @@ 
        Quick search
        
       ©2017, CDH @ Princeton & Trustees of Princeton University.
       
       |
-      Powered by Sphinx 3.3.1
+      Powered by Sphinx 3.5.3
       & Alabaster 0.7.12
       
     
        
diff --git a/docs/_modules/cdhweb/people/views.html b/docs/_modules/cdhweb/people/views.html
index d6a849c7f..1451721eb 100644
--- a/docs/_modules/cdhweb/people/views.html
+++ b/docs/_modules/cdhweb/people/views.html
@@ -5,14 +5,13 @@
   
     
     
-    cdhweb.people.views — CDH website 2.8.0 documentation
+    cdhweb.people.views — CDH website 3.0.0 documentation
     
     
     
     
     
     
-    
     
     
    
@@ -32,60 +31,21 @@
           
        
             
   
        Source code for cdhweb.people.views
        -from django.conf import settings
-from django.db.models import Max, Q, Case, When, Value
-from django.db.models.functions import Coalesce, Greatest
-from django.views.generic.detail import DetailView
+from django.db.models import Case, Max, Value, When
+from django.db.models.functions import Greatest
+from django.shortcuts import render
 from django.views.generic.list import ListView
 from django.urls import reverse
 
-from cdhweb.people.models import Profile
-from cdhweb.blog.models import BlogPost
-from cdhweb.resources.views import LastModifiedMixin, LastModifiedListMixin
-from cdhweb.resources.utils import absolutize_url
+from cdhweb.people.models import Person
+from cdhweb.pages.views import LastModifiedListMixin
 
 
-
        [docs]class ProfileMixinView(object):
-    '''Profile view mixin that sets model to Profile and returns a
-    published Profile queryset.'''
+
        [docs]class PersonListView(ListView, LastModifiedListMixin):
+    '''Base class for person list views'''
 
-    model = Profile
-
-    def get_queryset(self):
-        # use displayable manager to find published profiles only
-        # (or draft profiles for logged in users with permission to view)
-        return Profile.objects.published()  # TODO: published(for_user=self.request.user)
        
-
-
-
        [docs]class ProfileDetailView(ProfileMixinView, DetailView, LastModifiedMixin):
-
-
        [docs]    def get_queryset(self):
-        # only published profiles with staff flag get a detail page
-        return super().get_queryset().staff()
        
-
-
        [docs]    def get_context_data(self, *args, **kwargs):
-        context = super(ProfileDetailView, self).get_context_data(
-            *args, **kwargs)
-
-        # retrieve 3 most recent published blog posts with the current user as author
-        recent_posts = BlogPost.objects.filter(
-            users__id=self.object.user.id).published()[:3]
-
-        # also set object as page for common page display functionality
-        context.update({
-            'page': self.object,
-            'opengraph_type': 'profile',
-            'recent_posts': recent_posts,
-        })
-        if self.object.thumb:
-            context['preview_image'] = absolutize_url(''.join([settings.MEDIA_URL,
-                                                               str(self.object.thumb)]))
-
-        return context
        
-
-
-
        [docs]class ProfileListView(ProfileMixinView, ListView, LastModifiedListMixin):
-    '''Base class for profile list views'''
+    model = Person
+    lastmodified_attr = 'updated_at'
 
     #: title for this category of people
     page_title = ''
@@ -93,44 +53,44 @@ 
        Source code for cdhweb.people.views
             current_title = ''
     #: label for past people in this category of people
     past_title = ''
-    #: show CDH position on profile card (true by default)
-    show_cdh_position = True
-    #: show grant recepient information on profle card (true by default)
-    show_grant = True
-    #: show official job title (false by default)
-    show_job_title = False
-    #: show departmental or instutional affiliation (false by default)
-    show_affiliation = False
-    #: show related events (i.e. for speakers)
-    show_events = False
-
-
        [docs]    def get_queryset(self):
-        # get published profile ordered by position (job title then start date)
+
+
        [docs]    def get_queryset(self):
+        # get people ordered by position (job title then start date)
         return super().get_queryset().order_by_position().distinct()
        
 
-
        [docs]    def get_current_profiles(self):
-        '''Get current profiles from the queryset. Override to customize
+
        [docs]    def get_current(self):
+        '''Get current people from the queryset. Override to customize
         which filter is used. By default, uses generic current logic that
         checks both positions and grants.'''
         return self.object_list.current()
        
 
-
        [docs]    def get_past_profiles(self):
-        '''Get past profiles. Override to customize filters and ordering. By
+
        [docs]    def get_past(self):
+        '''Get past people. Override to customize filters and ordering. By
         default, assumes any profiles that aren't current are past.'''
-        current = self.get_current_profiles()
+        current = self.get_current()
         return self.object_list.exclude(id__in=current.values('id'))
        
 
-
        [docs]    def get_context_data(self):
+    def display_label(self, person):
+        # no default; force subclasses to implement
+        raise NotImplementedError
+
+    def add_display_label(self, queryset):
+        # annotate the queryset with label to be displayed for this view
+        for person in queryset:
+            person.label = self.display_label(person)
+        return queryset
+
+
        [docs]    def get_context_data(self):
         context = super().get_context_data()
         # update context to display current and past people separately
-        current = self.get_current_profiles()
+        current = self.get_current()
         # filter past based current ids, rather than trying to do the complicated
         # query to find not current people
-        past = self.get_past_profiles()
+        past = self.get_past()
         context.update({
-            'current': current,
-            'past': past,
-            'title': self.page_title,
+            'current': self.add_display_label(current),
+            'past': self.add_display_label(past),
+            'page_title': self.page_title,
             'past_title': self.past_title,
             'current_title': self.current_title or self.page_title,  # use main title as default
             'archive_nav_urls': [
@@ -138,41 +98,41 @@ 
        Source code for cdhweb.people.views
                         ('Students', reverse('people:students')),
                 ('Affiliates', reverse('people:affiliates')),
                 ('Executive Committee', reverse('people:exec-committee')),
-                ('Speakers', reverse('people:speakers')),
-            ],
-            # flags for profile card display
-            'show_cdh_position': self.show_cdh_position,
-            'show_grant': self.show_grant,
-            'show_job_title': self.show_job_title,
-            'show_affiliation': self.show_affiliation,
-            'show_events': self.show_events
+            ]
         })
         return context
        
 
 
-
        [docs]class StaffListView(ProfileListView):
+
        [docs]class StaffListView(PersonListView):
     '''Display current and past CDH staff'''
     page_title = 'Staff'
     past_title = 'Past Staff'
-    # don't show grant recipient info
-    show_grant = False
+
+    def display_label(self, person):
+        # for staff list view, label based on most recent position
+        last_position = person.positions.first()
+        label = last_position.title
+        # if position is not current, include years
+        if not last_position.is_current:
+            label = '%s %s' % (last_position.years, label)
+        return label
 
 
        [docs]    def get_queryset(self):
         # filter to profiles with staff flag set and exclude students
         # (already ordered by job title sort order and then by last name)
-        return super().get_queryset().staff().not_students()
        
+        return super().get_queryset().cdh_staff().not_students()
        
         # NOTE: if someone goes from a student role to a staff role, they need
         # to have their PU status changed to something that's not a student
         # in order to not be excluded from this page based on their previous
         # role
 
-
        [docs]    def get_current_profiles(self):
+
        [docs]    def get_current(self):
         # we only care about current position, grant doesn't matter;
         # filter out past faculty directors who are current exec members
         return self.object_list.current_position_nonexec()
        
 
 
-
        [docs]class StudentListView(ProfileListView):
+
        [docs]class StudentListView(PersonListView):
     '''Display current and past graduate fellows, graduate and undergraduate
     assistants.'''
     page_title = 'Students'
@@ -182,8 +142,53 @@ 
        Source code for cdhweb.people.views
                 # filter to just students
         return super().get_queryset().student_affiliates() \
             .grant_years().project_manager_years()
        
-
-
        [docs]    def get_past_profiles(self):
+        # FIXME: still getting some duplicates...
+
+    def display_label(self, person):
+        # for student assistants and fellows, label based on position
+        # students can multiple affiliations
+        labels = []
+        current_label = None
+        for position in person.positions.all():
+            label = str(position.title)
+            # if position is current, set as current label
+            if position.is_current:
+                current_label = label
+            # if not current, include years and add to list
+            else:
+                label = '%s %s' % (position.years, label)
+                labels.append(label)
+
+        if person.latest_grant:
+            # if student was a project director, show as grant recipient
+            grant = person.latest_grant
+            label = '%s %s Grant Recipient' % \
+                (grant.years, grant.grant_type.grant_type)
+            if grant.is_current:
+                current_label = label
+            else:
+                labels.append(label)
+
+        # for students on projects, label based on project membership
+        for membership in person.membership_set.filter(role__title='Project Manager'):
+            # NOTE: it might be better to use memberships for
+            # project director / grant role as well, but with the new
+            # data model it's harder to determine what type of grant they were on
+            label = membership.role.title
+            if membership.is_current:
+                current_label = label
+            else:
+                label = '%s %s' % (membership.years, label)
+                labels.append(label)
+
+        # if the student has a current affiliation, return only that
+        # otherwise return multiple
+        # NOTE: could truncate this list and/or prioritize certain titles/roles
+        return current_label or '\n'.join(sorted(set(labels), reverse=True))
+        # NOTE: at least one case is generating duplicate labels,
+        # not sure why!
+
+
        [docs]    def get_past(self):
         # show most recent first based on grant or position end date
         # NOTE the use of Case/When here is to avoid Greatest() returning NULL
         # if any of its arguments are NULL, which is mysql behavior:
@@ -192,91 +197,85 @@ 
        Source code for cdhweb.people.views
                 # https://docs.djangoproject.com/en/1.11/ref/models/conditional-expressions/#conditional-aggregation
         # NOTE also that this causes dates to be interpreted as strings in QA;
         # relevant ticket: https://code.djangoproject.com/ticket/30224
-        return super().get_past_profiles() \
+        return super().get_past() \
             .annotate(most_recent=Greatest(
                 Case(
-                    When(user__membership__end_date__isnull=False,
-                         then=Max('user__membership__end_date')),
-                    default=Value('0')
+                    When(membership__end_date__isnull=False,
+                         then=Max('membership__end_date')),
+                    default=Value('1900-01-01')
                 ),
                 Case(
-                    When(user__positions__end_date__isnull=False,
-                         then=Max('user__positions__end_date')),
-                    default=Value('0')
+                    When(positions__end_date__isnull=False,
+                         then=Max('positions__end_date')),
+                    default=Value('1900-01-01')
                 )
             )) \
             .order_by('-most_recent')
        
 
 
-
        [docs]class AffiliateListView(ProfileListView):
+
        [docs]class AffiliateListView(PersonListView):
     '''Display current and past faculty & staff affiliates'''
     page_title = 'Affiliates'
     past_title = 'Past {}'.format(page_title)
-    #: do not show person positions; want grant information instead
-    show_cdh_position = False
 
 
        [docs]    def get_queryset(self):
         # filter to affiliates, annotate with grant years, and order by name
         return super().get_queryset().affiliates().grant_years() \
-                      .order_by('user__last_name')
        
+                      .order_by('last_name')
        
+
+    def display_label(self, person):
+        # use grant information as label
+        grant = person.latest_grant
+        # special case for faculty fellowship display
+        if grant.grant_type.grant_type == 'Faculty Fellowship':
+            label = 'Faculty Fellow'
+        else:
+            label = '%s Grant Recipient' % grant.grant_type.grant_type
+
+        label = '%s %s' % (grant.years, label)
+        return label
 
-
        [docs]    def get_current_profiles(self):
+
        [docs]    def get_current(self):
         # we only care about current grants, position doesn't matter
         return self.object_list.current_grant()
        
 
 
-
        [docs]class ExecListView(ProfileListView):
+
        [docs]class ExecListView(PersonListView):
     '''Display current and past executive committee members.'''
     page_title = 'Executive Committee'
     past_title = 'Past members of {}'.format(page_title)
-    #: do not CDH positions or grants; show job title
-    show_cdh_position = False
-    show_grant = False
-    show_job_title = True
 
 
        [docs]    def get_queryset(self):
         # filter to exec members
-        return super().get_queryset().executive_committee().order_by('user__last_name')
        
+        return super().get_queryset().executive_committee().order_by('last_name')
        
 
-
        [docs]    def get_current_profiles(self):
+
        [docs]    def get_current(self):
         # we only care about current position, grant doesn't matter
         return self.object_list.current_position()
        
 
+    def display_label(self, person):
+        # for exec, we just want to show their job title
+        return person.job_title
+
 
        [docs]    def get_context_data(self):
         context = super().get_context_data()
         # executive committee needs an additional filter:
         # exec members, sits with committee, then alumni as usual
         current = context['current']
         context.update({
-            'current': current.exec_member(),
-            'sits_with': current.sits_with_exec(),
+            'current': self.add_display_label(current.exec_member()),
+            'sits_with': self.add_display_label(current.sits_with_exec()),
         })
         return context
        
 
 
-
        [docs]class SpeakerListView(ProfileListView):
-    '''Display upcoming and past speakers.'''
-    page_title = 'Speakers'
-    current_title = 'Upcoming {}'.format(page_title)
-    past_title = 'Past {}'.format(page_title)
-    #: show affiliation and info about events
-    show_affiliation = True
-    show_events = True
-    # don't show non-speaker related info (shouldn't happen)
-    show_grant = False
-    show_cdh_position = False
-
-
        [docs]    def get_queryset(self):
-        # filter to just speakers
-        return super().get_queryset().speakers()
        
-
-
        [docs]    def get_current_profiles(self):
-        # return only speakers with upcoming events, sorted by recent event
-        return self.object_list.has_upcoming_events().order_by_event()
        
-
-
        [docs]    def get_past_profiles(self):
-        # resort the past profiles and show latest first
-        return super().get_past_profiles().order_by_event().reverse()
        
+def speakerlist_gone(request):
+    # return 410 gone for speakers list view;
+    # (removed in 3.0, no longer needed after the Year of Data)
+    return render(request, 'errors/404.html', context={
+        'error_code': 410,
+        'message': "That page isn't here anymore."
+    }, status=410)
 
        
 
           
        
@@ -361,7 +360,7 @@ 
        Quick search
        
       ©2017, CDH @ Princeton & Trustees of Princeton University.
       
       |
-      Powered by Sphinx 3.3.1
+      Powered by Sphinx 3.5.3
       & Alabaster 0.7.12
       
     
        
diff --git a/docs/_modules/cdhweb/projects/models.html b/docs/_modules/cdhweb/projects/models.html
index f3b1a2f0a..416f56785 100644
--- a/docs/_modules/cdhweb/projects/models.html
+++ b/docs/_modules/cdhweb/projects/models.html
@@ -5,14 +5,13 @@
   
     
     
-    cdhweb.projects.models — CDH website 2.8.0 documentation
+    cdhweb.projects.models — CDH website 3.0.0 documentation
     
     
     
     
     
     
-    
     
     
    
@@ -32,23 +31,29 @@
           
        
             
   
        Source code for cdhweb.projects.models
        -from datetime import date
-
-from django.db import models
-from django.db.models import Q
+from django.db import models
 from django.urls import reverse
 from django.utils import timezone
 from mezzanine.core.fields import FileField, RichTextField
 from mezzanine.core.models import Displayable
 from mezzanine.utils.models import AdminThumbMixin, upload_to
+from modelcluster.contrib.taggit import ClusterTaggableManager
+from modelcluster.fields import ParentalKey
+from modelcluster.models import ClusterableModel
 from taggit.managers import TaggableManager
-
+from taggit.models import TaggedItemBase
+from wagtail.admin.edit_handlers import (FieldPanel, FieldRowPanel,
+                                         InlinePanel, StreamFieldPanel)
+from wagtail.core.models import Page, PageManager, PageQuerySet
+from wagtail.images.edit_handlers import ImageChooserPanel
+
+from cdhweb.pages.models import (BasePage, LandingPage, LinkPage,
+                                 RelatedLink, RelatedLinkType)
 from cdhweb.people.models import Person
-from cdhweb.resources.models import (Attachment, DateRange, ExcerptMixin,
-                                     PublishedQuerySetMixin, ResourceType)
+from cdhweb.resources.models import Attachment, DateRange, ExcerptMixin
 
 
-
        [docs]class ProjectQuerySet(PublishedQuerySetMixin):
+
        [docs]class ProjectQuerySet(PageQuerySet):
 
 
        [docs]    def highlighted(self):
         '''return projects that are marked as highlighted'''
@@ -60,9 +65,9 @@ 
        Source code for cdhweb.projects.models
                 date or not set.
         '''
         today = timezone.now()
-        return (models.Q(grant__start_date__lt=today) &
-                (models.Q(grant__end_date__gt=today) |
-                 models.Q(grant__end_date__isnull=True)))
+        return (models.Q(grants__start_date__lt=today) &
+                (models.Q(grants__end_date__gt=today) |
+                 models.Q(grants__end_date__isnull=True)))
 
 
        [docs]    def current(self):
         '''Projects with a current grant, based on dates'''
@@ -78,11 +83,13 @@ 
        Source code for cdhweb.projects.models
         
 
        [docs]    def staff_or_postdoc(self):
         '''Staff and postdoc projects, based on grant type'''
-        return self.filter(grant__grant_type__grant_type__in=self.staff_postdoc_grants)
        
+        return self.filter(grants__grant_type__grant_type__in=self.staff_postdoc_grants) \
+            .exclude(working_group=True)
        
 
 
        [docs]    def not_staff_or_postdoc(self):
         '''Exclude staff and postdoc projects, based on grant type'''
-        return self.exclude(grant__grant_type__grant_type__in=self.staff_postdoc_grants)
        
+        return self.exclude(grants__grant_type__grant_type__in=self.staff_postdoc_grants) \
+            .exclude(working_group=True)
        
 
 
        [docs]    def working_groups(self):
         '''Include only projects with the working group flag set'''
@@ -93,11 +100,16 @@ 
        Source code for cdhweb.projects.models
                 sort by project title'''
         # NOTE: using annotation to get just the most recent start date
         # to avoid issues with projects appearing multiple times.
-        return self.annotate(last_start=models.Max('grant__start_date')) \
+        return self.annotate(last_start=models.Max('grants__start_date')) \
                    .order_by('-last_start', 'title')
        
 
 
-
        [docs]class Project(Displayable, AdminThumbMixin, ExcerptMixin):
+# custom manager for wagtail pages, see:
+# https://docs.wagtail.io/en/stable/topics/pages.html#custom-page-managers
+ProjectManager = PageManager.from_queryset(ProjectQuerySet)
+
+
+
        [docs]class OldProject(Displayable, AdminThumbMixin, ExcerptMixin):
     '''A CDH sponsored project'''
 
     short_description = models.CharField(max_length=255, blank=True,
@@ -109,9 +121,9 @@ 
        Source code for cdhweb.projects.models
                                             help_text='Project built by CDH Development & Design team.')
     working_group = models.BooleanField(
         'Working Group', default=False, help_text='Project is a long-term collaborative group associated with the CDH.')
-
     members = models.ManyToManyField(Person, through='Membership')
-    resources = models.ManyToManyField(ResourceType, through='ProjectResource')
+    resources = models.ManyToManyField(
+        RelatedLinkType, through='ProjectRelatedLink')
 
     tags = TaggableManager(blank=True)
 
@@ -134,6 +146,12 @@ 
        Source code for cdhweb.projects.models
         
     admin_thumb_field = "thumb"
 
+    # TODO: Insert panels after creating project wagtail page
+    # content_panels = Page.content_panels + [
+    #     #....
+    #     InlinePanel("related_links", heading="Related Links"),
+    # ]
+
     class Meta:
         # sort by project title for now
         ordering = ['title']
@@ -141,23 +159,23 @@ 
        Source code for cdhweb.projects.models
             def __str__(self):
         return self.title
 
-
        [docs]    def get_absolute_url(self):
+
        [docs]    def get_absolute_url(self):
         return reverse('project:detail', kwargs={'slug': self.slug})
        
 
     @property
     def website_url(self):
         '''website url, if set'''
-        website = self.projectresource_set \
-            .filter(resource_type__name='Website').first()
+        website = self.related_links \
+            .filter(type__name='Website').first()
         if website:
             return website.url
 
-
        [docs]    def latest_grant(self):
+
        [docs]    def latest_grant(self):
         '''Most recent :class:`Grant`'''
         if self.grant_set.count():
             return self.grant_set.order_by('-start_date').first()
        
 
-
        [docs]    def current_memberships(self):
+
        [docs]    def current_memberships(self):
         ''':class:`MembershipQueryset` of current members sorted by role'''
         # uses memberships rather than members so that we can retain role
         # information attached to the membership
@@ -180,7 +198,7 @@ 
        Source code for cdhweb.projects.models
                         models.Q(end_date__gte=today) | models.Q(end_date__isnull=True)
         )
        
 
-
        [docs]    def alums(self):
+
        [docs]    def alums(self):
         ''':class:`PersonQueryset` of past members sorted by last name'''
         # uses people rather than memberships so that we can use distinct()
         # to ensure people aren't counted multiple times for each grant
@@ -191,6 +209,130 @@ 
        Source code for cdhweb.projects.models
                     .order_by('last_name')
        
 
 
+
        [docs]class ProjectTag(TaggedItemBase):
+    """Tags for Project pages."""
+    content_object = ParentalKey(
+        "projects.Project", on_delete=models.CASCADE, related_name="tagged_items")
        
+
+
+
        [docs]class Project(BasePage, ClusterableModel):
+    """Page type for a CDH sponsored project or working group."""
+    short_description = models.CharField(max_length=255, blank=True,
+                                         help_text="Brief tagline for display on project card in browse view")
+    highlight = models.BooleanField(default=False,
+                                    help_text="Include in randomized project display on the home page.")
+    cdh_built = models.BooleanField("CDH Built", default=False,
+                                    help_text="Project built by CDH Development & Design team.")
+    working_group = models.BooleanField(
+        "Working Group", default=False, help_text="Project is a long-term collaborative group associated with the CDH.")
+    image = models.ForeignKey('wagtailimages.image', null=True,
+                              blank=True, on_delete=models.SET_NULL,
+                              related_name='+', help_text="Image for display on project detail page (optional)")
+    thumbnail = models.ForeignKey('wagtailimages.image', null=True,
+                                  blank=True, on_delete=models.SET_NULL,
+                                  related_name='+', help_text="Image for display on project card (optional)")
+    members = models.ManyToManyField(Person, through="Membership")
+    tags = ClusterTaggableManager(through=ProjectTag, blank=True)
+    # TODO attachments (#245)
+
+    # can only be created underneath project landing page
+    parent_page_types = ["projects.ProjectsLandingPage"]
+    # no allowed subpages
+    subpage_types = []
+
+    # admin edit configuration
+    content_panels = Page.content_panels + [
+        FieldRowPanel((FieldPanel("highlight"),
+                       FieldPanel("cdh_built"),
+                       FieldPanel("working_group")), "Settings"),
+        FieldRowPanel((ImageChooserPanel("thumbnail"),
+                       ImageChooserPanel("image")), "Images"),
+        FieldPanel("short_description"),
+        StreamFieldPanel("body"),
+        InlinePanel("related_links", label="Links"),
+        InlinePanel("grants", panels=[FieldRowPanel((
+            FieldPanel("start_date"), FieldPanel("end_date")
+        )), FieldPanel("grant_type")], label="Grants"),
+        InlinePanel("memberships", panels=[FieldRowPanel((
+            FieldPanel("start_date"),
+            FieldPanel("end_date"))),
+            FieldPanel("person"), FieldPanel("role")
+        ], label="Members"),
+        StreamFieldPanel("attachments")
+    ]
+    promote_panels = Page.promote_panels + [
+        FieldPanel("tags")
+    ]
+
+    # custom manager/queryset logic
+    objects = ProjectManager()
+
+    def __str__(self):
+        return self.title
+
+    @property
+    def website_url(self):
+        """URL for this Project's website, if set"""
+        website = self.related_links.filter(type__name="Website").first()
+        if website:
+            return website.url
+
+
        [docs]    def latest_grant(self):
+        """Most recent :class:`Grant` for this Project"""
+        if self.grants.count():
+            return self.grants.order_by("-start_date").first()
        
+
+
        [docs]    def current_memberships(self):
+        """:class:`MembershipQueryset` of current members sorted by role"""
+        # NOTE memberships is a FakeQuerySet from modelcluster.ParentalKey when
+        # the page is being previewed in wagtail, so Q lookups are not possible.
+        # see: https://github.com/wagtail/django-modelcluster/issues/121
+        memberships = Membership.objects.filter(project__pk=self.pk)
+        # uses memberships rather than members so that we can retain role
+        # information attached to the membership
+        today = timezone.now().date()
+        # if the last grant for this project is over, display the team
+        # for that grant period
+        latest_grant = self.latest_grant()
+        if latest_grant and latest_grant.end_date and \
+           latest_grant.end_date < today:
+            return memberships \
+                .filter(start_date__lte=latest_grant.end_date) \
+                .filter(
+                    models.Q(end_date__gte=latest_grant.start_date) |
+                    models.Q(end_date__isnull=True)
+                )
+
+        # otherwise, return current members based on date
+        return memberships \
+            .filter(start_date__lte=today) \
+            .filter(
+                models.Q(end_date__gte=today) |
+                models.Q(end_date__isnull=True)
+            )
        
+
+
        [docs]    def alums(self):
+        """:class:`PersonQueryset` of past members sorted by last name"""
+        # uses people rather than memberships so that we can use distinct()
+        # to ensure people aren't counted multiple times for each grant
+        # and because we don't care about role (always 'alum')
+        return self.members \
+            .distinct() \
+            .exclude(membership__in=self.current_memberships()) \
+            .order_by("last_name")
        
+
+
        [docs]    def get_sitemap_urls(self, request):
+        """Override sitemap to prioritize projects built by CDH with a website."""
+        # output is a list of dict; there should only ever be one element. see:
+        # https://docs.wagtail.io/en/stable/reference/contrib/sitemaps.html#urls
+        urls = super().get_sitemap_urls(request=request)
+        if self.website_url and self.cdh_built:
+            urls[0]["priority"] = 0.7
+        elif self.website_url or self.cdh_built:
+            urls[0]["priority"] = 0.6
+        return urls
        
+
+
 
        [docs]class GrantType(models.Model):
     '''Model to track kinds of grants'''
     grant_type = models.CharField(max_length=255, unique=True)
@@ -201,7 +343,10 @@ 
        Source code for cdhweb.projects.models
         
 
        [docs]class Grant(DateRange):
     '''A specific grant associated with a project'''
-    project = models.ForeignKey(Project, on_delete=models.CASCADE)
+    project = ParentalKey(
+        Project, null=True, on_delete=models.SET_NULL, related_name="grants")
+    old_project = models.ForeignKey(
+        OldProject, null=True, editable=False, on_delete=models.SET_NULL)
     grant_type = models.ForeignKey(GrantType, on_delete=models.CASCADE)
 
     class Meta:
@@ -212,9 +357,6 @@ 
        Source code for cdhweb.projects.models
                                         self.years)
        
 
 
-# fixme: where does resource type go, for associated links?
-
-
 
        [docs]class Role(models.Model):
     '''A role on a project'''
     title = models.CharField(max_length=255, unique=True)
@@ -225,36 +367,64 @@ 
        Source code for cdhweb.projects.models
                 ordering = ['sort_order']
 
     def __str__(self):
-        return self.title
        
+        return self.title
+
+    def __lt__(self, other):
+        # NOTE we need to order Memberships using role sort order by default,
+        # but modelcluster doesn't support ordering via related lookups, so
+        # we can't order by role__sort_order on Membership. Instead we do this.
+        # see: https://github.com/wagtail/django-modelcluster/issues/45
+        return self.sort_order < other.sort_order
        
 
 
 
        [docs]class Membership(DateRange):
-    '''Project membership - joins project, grant, user, and role.'''
-    project = models.ForeignKey(Project, on_delete=models.CASCADE)
+    '''Project membership - joins project, user, and role.'''
+    project = ParentalKey(Project, on_delete=models.SET_NULL, null=True,
+                          related_name="memberships")
+    old_project = models.ForeignKey(
+        OldProject, null=True, editable=False, on_delete=models.SET_NULL)
     person = models.ForeignKey(Person, on_delete=models.CASCADE)
     role = models.ForeignKey(Role, on_delete=models.CASCADE)
 
     class Meta:
-        ordering = ('role__sort_order', 'person__last_name')
+        ordering = ('role', 'person')
+
+    # admin edit configuration
+    panels = [
+        FieldRowPanel((FieldPanel("start_date"),
+                       FieldPanel("end_date")), "Dates"),
+        FieldPanel("person"),
+        FieldPanel("role"),
+        FieldPanel("project"),
+    ]
 
     def __str__(self):
         return '%s - %s on %s (%s)' % (self.person, self.role,
                                        self.project, self.years)
        
 
 
-
        [docs]class ProjectResource(models.Model):
-    '''Through-model for associating projects with resource types and
-    URLs'''
-    resource_type = models.ForeignKey(ResourceType, on_delete=models.CASCADE)
-    project = models.ForeignKey(Project, on_delete=models.CASCADE)
-    url = models.URLField()
+
+
+
+
        [docs]class ProjectsLandingPage(LandingPage):
+    """Container page that defines where Project pages can be created."""
+    # NOTE this page can't be created in the page editor; it is only ever made
+    # via a script or the console, since there's only one.
+    parent_page_types = []
+    # NOTE the only allowed child page type is a Project; this is so that
+    # Projects made in the admin automatically are created here.
+    subpage_types = [Project, LinkPage]
+    # use the regular landing page template
+    template = LandingPage.template
        
 
-
        [docs]    def display_url(self):
-        '''url cleaned up for display, with leading http(s):// removed'''
-        if self.url.startswith('https://'):
-            return self.url[8:]
-        elif self.url.startswith('http://'):
-            return self.url[7:]
        
 
        
 
           
        
@@ -339,7 +509,7 @@ 
        Quick search
        
       ©2017, CDH @ Princeton & Trustees of Princeton University.
       
       |
-      Powered by Sphinx 3.3.1
+      Powered by Sphinx 3.5.3
       & Alabaster 0.7.12
       
     
        
diff --git a/docs/_modules/cdhweb/projects/views.html b/docs/_modules/cdhweb/projects/views.html
index 5db8471b9..b41aa776d 100644
--- a/docs/_modules/cdhweb/projects/views.html
+++ b/docs/_modules/cdhweb/projects/views.html
@@ -5,14 +5,13 @@
   
     
     
-    cdhweb.projects.views — CDH website 2.8.0 documentation
+    cdhweb.projects.views — CDH website 3.0.0 documentation
     
     
     
     
     
     
-    
     
     
    
@@ -32,83 +31,90 @@
           
        
             
   
        Source code for cdhweb.projects.views
        -from django.db.models import Count
-from django.views.generic.detail import DetailView
+from django.urls import reverse
 from django.views.generic.list import ListView
 
 from cdhweb.projects.models import Project
-from cdhweb.resources.views import LastModifiedMixin, LastModifiedListMixin
+from cdhweb.pages.views import LastModifiedListMixin
 
 
-
        [docs]class ProjectMixinView(object):
-    '''View mixin that sets model to Project and returns a
-    published Project queryset.'''
-    model = Project
-    title = 'Projects'
-
-    def get_queryset(self):
-        # use displayable manager to find published events only
-        # (or draft profiles for logged in users with permission to view)
-        return Project.objects.published() # TODO: published(for_user=self.request.user)
        
-
+
        [docs]class ProjectListView(ListView, LastModifiedListMixin):
+    """Base class for project list views."""
 
-
        [docs]class ProjectListMixinView(ProjectMixinView, ListView, LastModifiedListMixin):
-
-
        [docs]    def get_context_data(self, *args, **kwargs):
-        context = super().get_context_data(*args, **kwargs)
-        # update context to display current and past projects separately
-        context.update({
-            'project_list': self.object_list.current(),
-            'past_projects': self.object_list.not_current().order_by_newest_grant(),
-            'title': self.title
-        })
-        return context
        
+    model = Project
+    lastmodified_attr = "last_published_at"
 
+    #: title for this category of projects
+    page_title = "Projects"
+    #: title for past projects in this category of projects
+    past_title = "Past Projects"
 
-
        [docs]class WorkingGroupListView(ProjectMixinView, ListView, LastModifiedListMixin):
-    '''Working groups, based on working group project flag'''
+
        [docs]    def get_queryset(self):
+        """Get all published projects ordered by newest grant."""
+        return super().get_queryset().live().order_by_newest_grant().distinct()
        
 
-    title = 'DH Working Groups'
+
        [docs]    def get_current(self):
+        """Get current projects from the queryset. Override to customize which
+        filter is used."""
+        return self.object_list.current()
        
 
-
        [docs]    def get_queryset(self):
-        return Project.objects.working_groups().published()
        
+
        [docs]    def get_past(self):
+        """Get past projects from the queryset. Override to customize which
+        filter is used."""
+        return self.object_list.not_current()
        
 
-
        [docs]    def get_context_data(self, *args, **kwargs):
+
        [docs]    def get_context_data(self, *args, **kwargs):
+        """Add projects, titles, and navigation to context."""
         context = super().get_context_data(*args, **kwargs)
-        # working groups never expire, so we don't have "past projects"
         context.update({
-            'project_list': self.object_list,
-            'past_projects': None,
-            'title': self.title
+            "current": self.get_current(),
+            "past": self.get_past(),
+            "page_title": self.page_title,
+            "past_title": self.past_title,
+            "archive_nav_urls": (
+                ("Sponsored Projects", reverse("projects:sponsored")),
+                ("Staff Projects", reverse("projects:staff")),
+                ("DH Working Groups", reverse("projects:working-groups")),
+            )
         })
         return context
        
 
 
-
        [docs]class ProjectListView(ProjectListMixinView):
-    '''Current and past projects, based on grant dates. (Does not include
-    staff and postdoc projects.)'''
+
        [docs]class SponsoredProjectListView(ProjectListView):
+    """Main project list, i.e. not staff/postdoc/working group."""
 
-
        [docs]    def get_queryset(self):
+    page_title = "Sponsored Projects"
+
+
        [docs]    def get_queryset(self):
+        """Get all published sponsored projects."""
         return super().get_queryset().not_staff_or_postdoc()
        
 
 
-
        [docs]class StaffProjectListView(ProjectListMixinView):
-    '''Staff projects, based on special staff R&D grant'''
+
        [docs]class StaffProjectListView(ProjectListView):
+    """Staff and postdoc projects, based on grant type."""
 
-    title = 'Staff and Postdoctoral Fellow Projects'
+    page_title = "Staff Projects"
 
 
        [docs]    def get_queryset(self):
+        """Get all published staff/postdoc projects."""
         return super().get_queryset().staff_or_postdoc()
        
 
 
-
        [docs]class ProjectDetailView(ProjectMixinView, DetailView, LastModifiedMixin):
+
        [docs]class WorkingGroupListView(ProjectListView):
+    """DH Working group list, based on working group project flag."""
 
-
        [docs]    def get_context_data(self, *args, **kwargs):
-        context = super(ProjectDetailView, self).get_context_data(*args, **kwargs)
-        # also set object as page for common page display functionality
-        context['page'] = self.object
-        return context
        
+    page_title = "DH Working Groups"
 
+
        [docs]    def get_queryset(self):
+        """Get all published DH working groups."""
+        return Project.objects.working_groups()
        
+
+
        [docs]    def get_context_data(self, *args, **kwargs):
+        """Override so that working groups are never shown as past."""
+        context = super().get_context_data(*args, **kwargs)
+        context["current"] = self.object_list   # use cached queryset
+        context["past"] = []
+        return context
        
 
        
 
           
        
@@ -193,7 +199,7 @@ 
        Quick search
        
       ©2017, CDH @ Princeton & Trustees of Princeton University.
       
       |
-      Powered by Sphinx 3.3.1
+      Powered by Sphinx 3.5.3
       & Alabaster 0.7.12
       
     
        
diff --git a/docs/_modules/cdhweb/resources/models.html b/docs/_modules/cdhweb/resources/models.html
index ccd77f432..234745004 100644
--- a/docs/_modules/cdhweb/resources/models.html
+++ b/docs/_modules/cdhweb/resources/models.html
@@ -5,14 +5,13 @@
   
     
     
-    cdhweb.resources.models — CDH website 2.8.0 documentation
+    cdhweb.resources.models — CDH website 3.0.0 documentation
     
     
     
     
     
     
-    
     
     
    
@@ -44,24 +43,7 @@ 
        Source code for cdhweb.resources.models
         from mezzanine.pages.models import Page
 from mezzanine.utils.models import upload_to
 
-
-
        [docs]class ResourceType(models.Model):
-    '''Resource type for associating particular kinds of URLs
-    with people and projects (e.g., project url, GitHub, Twitter, etc)'''
-    name = models.CharField(max_length=255)
-    sort_order = models.PositiveIntegerField(default=0, blank=False,
-        null=False)
-    # NOTE: defining the relationship here since we can't add to it to
-    # django's auth.User directly
-    users = models.ManyToManyField(User, through='UserResource',
-        related_name='resources')
-
-    class Meta:
-        ordering = ['sort_order']
-
-    def __str__(self):
-        return self.name
        
-
+from cdhweb.pages.models import RelatedLinkType
 
 class ExcerptMixin(object):
 
@@ -73,20 +55,11 @@ 
        Source code for cdhweb.resources.models
                     return self.description
 
 
-
-
        [docs]class UserResource(models.Model):
-    '''Through-model for associating users with resource types and
-    corresponding URLs for the specified resource type.'''
-    resource_type = models.ForeignKey(ResourceType, on_delete=models.CASCADE)
-    user = models.ForeignKey(User, on_delete=models.CASCADE)
-    url = models.URLField()
        
-
-
 
        [docs]class Attachment(models.Model):
     title = models.CharField(max_length=255)
     author = models.CharField(max_length=255, blank=True)
     file = FileField('Document', blank=True,
-        upload_to=upload_to("resources.documents", "documents"))
+                     upload_to=upload_to("resources.documents", "documents"))
     url = models.URLField(blank=True)
     # TODO: needs validation to ensure one and only one of
     # file and url is set
@@ -102,7 +75,8 @@ 
        Source code for cdhweb.resources.models
             )
     attachment_type = models.CharField(max_length=255, choices=type_choices)
 
-    pages = models.ManyToManyField(Page, related_name='attachments', blank=True)
+    pages = models.ManyToManyField(
+        Page, related_name='old_attachments', blank=True)
 
     def __str__(self):
         parts = [self.title]
@@ -116,8 +90,9 @@ 
        Source code for cdhweb.resources.models
         
        [docs]class LandingPage(Page, RichText):
     tagline = models.CharField(max_length=255)
     image = FileField(verbose_name="Image",
-        upload_to=upload_to("resources.landing_pages.image", "resources"),
-        format="Image", max_length=255, null=True, blank=True)
        
+                      upload_to=upload_to(
+                          "resources.landing_pages.image", "resources"),
+                      format="Image", max_length=255, null=True, blank=True)
        
 
 
 
        [docs]class PublishedQuerySetMixin(models.QuerySet):
@@ -134,8 +109,10 @@ 
        Source code for cdhweb.resources.models
                 if for_user is not None and for_user.is_staff:
             return self.all()
         return self.filter(
-            models.Q(publish_date__lte=now()) | models.Q(publish_date__isnull=True),
-            models.Q(expiry_date__gte=now()) | models.Q(expiry_date__isnull=True),
+            models.Q(publish_date__lte=now()) | models.Q(
+                publish_date__isnull=True),
+            models.Q(expiry_date__gte=now()) | models.Q(
+                expiry_date__isnull=True),
             models.Q(status=CONTENT_STATUS_PUBLISHED))
        
 
 
@@ -268,7 +245,7 @@ 
        Quick search
        
       ©2017, CDH @ Princeton & Trustees of Princeton University.
       
       |
-      Powered by Sphinx 3.3.1
+      Powered by Sphinx 3.5.3
       & Alabaster 0.7.12
       
     
        
diff --git a/docs/_modules/django/db/models/query_utils.html b/docs/_modules/django/db/models/query_utils.html
deleted file mode 100644
index 33b084d24..000000000
--- a/docs/_modules/django/db/models/query_utils.html
+++ /dev/null
@@ -1,464 +0,0 @@
-
-
-
-
-  
-    
-    
-    django.db.models.query_utils — CDH website 2.8.0 documentation
-    
-    
-    
-    
-    
-    
-    
-    
-    
-   
-  
-  
-  
-  
-
-  
-  
-
-    
        
-      
        
-        
        
-          
-
-          
        
-            
-  
        Source code for django.db.models.query_utils
        -"""
-Various data structures used in query construction.
-
-Factored out from django.db.models.query to avoid making the main module very
-large and/or so that they can be used by other modules without getting into
-circular import difficulties.
-"""
-import copy
-import functools
-import inspect
-from collections import namedtuple
-
-from django.db.models.constants import LOOKUP_SEP
-from django.utils import tree
-
-# PathInfo is used when converting lookups (fk__somecol). The contents
-# describe the relation in Model terms (model Options and Fields for both
-# sides of the relation. The join_field is the field backing the relation.
-PathInfo = namedtuple('PathInfo', 'from_opts to_opts target_fields join_field m2m direct filtered_relation')
-
-
-class InvalidQuery(Exception):
-    """The query passed to raw() isn't a safe query to use with raw()."""
-    pass
-
-
-def subclasses(cls):
-    yield cls
-    for subclass in cls.__subclasses__():
-        yield from subclasses(subclass)
-
-
-class QueryWrapper:
-    """
-    A type that indicates the contents are an SQL fragment and the associate
-    parameters. Can be used to pass opaque data to a where-clause, for example.
-    """
-    contains_aggregate = False
-
-    def __init__(self, sql, params):
-        self.data = sql, list(params)
-
-    def as_sql(self, compiler=None, connection=None):
-        return self.data
-
-
-class Q(tree.Node):
-    """
-    Encapsulate filters as objects that can then be combined logically (using
-    `&` and `|`).
-    """
-    # Connection types
-    AND = 'AND'
-    OR = 'OR'
-    default = AND
-    conditional = True
-
-    def __init__(self, *args, _connector=None, _negated=False, **kwargs):
-        super().__init__(children=[*args, *sorted(kwargs.items())], connector=_connector, negated=_negated)
-
-    def _combine(self, other, conn):
-        if not isinstance(other, Q):
-            raise TypeError(other)
-
-        # If the other Q() is empty, ignore it and just use `self`.
-        if not other:
-            return copy.deepcopy(self)
-        # Or if this Q is empty, ignore it and just use `other`.
-        elif not self:
-            return copy.deepcopy(other)
-
-        obj = type(self)()
-        obj.connector = conn
-        obj.add(self, conn)
-        obj.add(other, conn)
-        return obj
-
-    def __or__(self, other):
-        return self._combine(other, self.OR)
-
-    def __and__(self, other):
-        return self._combine(other, self.AND)
-
-    def __invert__(self):
-        obj = type(self)()
-        obj.add(self, self.AND)
-        obj.negate()
-        return obj
-
-    def resolve_expression(self, query=None, allow_joins=True, reuse=None, summarize=False, for_save=False):
-        # We must promote any new joins to left outer joins so that when Q is
-        # used as an expression, rows aren't filtered due to joins.
-        clause, joins = query._add_q(self, reuse, allow_joins=allow_joins, split_subq=False)
-        query.promote_joins(joins)
-        return clause
-
-    def deconstruct(self):
-        path = '%s.%s' % (self.__class__.__module__, self.__class__.__name__)
-        if path.startswith('django.db.models.query_utils'):
-            path = path.replace('django.db.models.query_utils', 'django.db.models')
-        args, kwargs = (), {}
-        if len(self.children) == 1 and not isinstance(self.children[0], Q):
-            child = self.children[0]
-            kwargs = {child[0]: child[1]}
-        else:
-            args = tuple(self.children)
-            if self.connector != self.default:
-                kwargs = {'_connector': self.connector}
-        if self.negated:
-            kwargs['_negated'] = True
-        return path, args, kwargs
-
-
-class DeferredAttribute:
-    """
-    A wrapper for a deferred-loading field. When the value is read from this
-    object the first time, the query is executed.
-    """
-    def __init__(self, field_name):
-        self.field_name = field_name
-
-    def __get__(self, instance, cls=None):
-        """
-        Retrieve and caches the value from the datastore on the first lookup.
-        Return the cached value.
-        """
-        if instance is None:
-            return self
-        data = instance.__dict__
-        if data.get(self.field_name, self) is self:
-            # Let's see if the field is part of the parent chain. If so we
-            # might be able to reuse the already loaded value. Refs #18343.
-            val = self._check_parent_chain(instance, self.field_name)
-            if val is None:
-                instance.refresh_from_db(fields=[self.field_name])
-                val = getattr(instance, self.field_name)
-            data[self.field_name] = val
-        return data[self.field_name]
-
-    def _check_parent_chain(self, instance, name):
-        """
-        Check if the field value can be fetched from a parent field already
-        loaded in the instance. This can be done if the to-be fetched
-        field is a primary key field.
-        """
-        opts = instance._meta
-        f = opts.get_field(name)
-        link_field = opts.get_ancestor_link(f.model)
-        if f.primary_key and f != link_field:
-            return getattr(instance, link_field.attname)
-        return None
-
-
-class RegisterLookupMixin:
-
-    @classmethod
-    def _get_lookup(cls, lookup_name):
-        return cls.get_lookups().get(lookup_name, None)
-
-    @classmethod
-    @functools.lru_cache(maxsize=None)
-    def get_lookups(cls):
-        class_lookups = [parent.__dict__.get('class_lookups', {}) for parent in inspect.getmro(cls)]
-        return cls.merge_dicts(class_lookups)
-
-    def get_lookup(self, lookup_name):
-        from django.db.models.lookups import Lookup
-        found = self._get_lookup(lookup_name)
-        if found is None and hasattr(self, 'output_field'):
-            return self.output_field.get_lookup(lookup_name)
-        if found is not None and not issubclass(found, Lookup):
-            return None
-        return found
-
-    def get_transform(self, lookup_name):
-        from django.db.models.lookups import Transform
-        found = self._get_lookup(lookup_name)
-        if found is None and hasattr(self, 'output_field'):
-            return self.output_field.get_transform(lookup_name)
-        if found is not None and not issubclass(found, Transform):
-            return None
-        return found
-
-    @staticmethod
-    def merge_dicts(dicts):
-        """
-        Merge dicts in reverse to preference the order of the original list. e.g.,
-        merge_dicts([a, b]) will preference the keys in 'a' over those in 'b'.
-        """
-        merged = {}
-        for d in reversed(dicts):
-            merged.update(d)
-        return merged
-
-    @classmethod
-    def _clear_cached_lookups(cls):
-        for subclass in subclasses(cls):
-            subclass.get_lookups.cache_clear()
-
-    @classmethod
-    def register_lookup(cls, lookup, lookup_name=None):
-        if lookup_name is None:
-            lookup_name = lookup.lookup_name
-        if 'class_lookups' not in cls.__dict__:
-            cls.class_lookups = {}
-        cls.class_lookups[lookup_name] = lookup
-        cls._clear_cached_lookups()
-        return lookup
-
-    @classmethod
-    def _unregister_lookup(cls, lookup, lookup_name=None):
-        """
-        Remove given lookup from cls lookups. For use in tests only as it's
-        not thread-safe.
-        """
-        if lookup_name is None:
-            lookup_name = lookup.lookup_name
-        del cls.class_lookups[lookup_name]
-
-
-def select_related_descend(field, restricted, requested, load_fields, reverse=False):
-    """
-    Return True if this field should be used to descend deeper for
-    select_related() purposes. Used by both the query construction code
-    (sql.query.fill_related_selections()) and the model instance creation code
-    (query.get_klass_info()).
-
-    Arguments:
-     * field - the field to be checked
-     * restricted - a boolean field, indicating if the field list has been
-       manually restricted using a requested clause)
-     * requested - The select_related() dictionary.
-     * load_fields - the set of fields to be loaded on this model
-     * reverse - boolean, True if we are checking a reverse select related
-    """
-    if not field.remote_field:
-        return False
-    if field.remote_field.parent_link and not reverse:
-        return False
-    if restricted:
-        if reverse and field.related_query_name() not in requested:
-            return False
-        if not reverse and field.name not in requested:
-            return False
-    if not restricted and field.null:
-        return False
-    if load_fields:
-        if field.attname not in load_fields:
-            if restricted and field.name in requested:
-                raise InvalidQuery("Field %s.%s cannot be both deferred"
-                                   " and traversed using select_related"
-                                   " at the same time." %
-                                   (field.model._meta.object_name, field.name))
-    return True
-
-
-def refs_expression(lookup_parts, annotations):
-    """
-    Check if the lookup_parts contains references to the given annotations set.
-    Because the LOOKUP_SEP is contained in the default annotation names, check
-    each prefix of the lookup_parts for a match.
-    """
-    for n in range(1, len(lookup_parts) + 1):
-        level_n_lookup = LOOKUP_SEP.join(lookup_parts[0:n])
-        if level_n_lookup in annotations and annotations[level_n_lookup]:
-            return annotations[level_n_lookup], lookup_parts[n:]
-    return False, ()
-
-
-def check_rel_lookup_compatibility(model, target_opts, field):
-    """
-    Check that self.model is compatible with target_opts. Compatibility
-    is OK if:
-      1) model and opts match (where proxy inheritance is removed)
-      2) model is parent of opts' model or the other way around
-    """
-    def check(opts):
-        return (
-            model._meta.concrete_model == opts.concrete_model or
-            opts.concrete_model in model._meta.get_parent_list() or
-            model in opts.get_parent_list()
-        )
-    # If the field is a primary key, then doing a query against the field's
-    # model is ok, too. Consider the case:
-    # class Restaurant(models.Model):
-    #     place = OnetoOneField(Place, primary_key=True):
-    # Restaurant.objects.filter(pk__in=Restaurant.objects.all()).
-    # If we didn't have the primary key check, then pk__in (== place__in) would
-    # give Place's opts as the target opts, but Restaurant isn't compatible
-    # with that. This logic applies only to primary keys, as when doing __in=qs,
-    # we are going to turn this into __in=qs.values('pk') later on.
-    return (
-        check(target_opts) or
-        (getattr(field, 'primary_key', False) and check(field.model._meta))
-    )
-
-
-class FilteredRelation:
-    """Specify custom filtering in the ON clause of SQL joins."""
-
-    def __init__(self, relation_name, *, condition=Q()):
-        if not relation_name:
-            raise ValueError('relation_name cannot be empty.')
-        self.relation_name = relation_name
-        self.alias = None
-        if not isinstance(condition, Q):
-            raise ValueError('condition argument must be a Q() instance.')
-        self.condition = condition
-        self.path = []
-
-    def __eq__(self, other):
-        return (
-            isinstance(other, self.__class__) and
-            self.relation_name == other.relation_name and
-            self.alias == other.alias and
-            self.condition == other.condition
-        )
-
-    def clone(self):
-        clone = FilteredRelation(self.relation_name, condition=self.condition)
-        clone.alias = self.alias
-        clone.path = self.path[:]
-        return clone
-
-    def resolve_expression(self, *args, **kwargs):
-        """
-        QuerySet.annotate() only accepts expression-like arguments
-        (with a resolve_expression() method).
-        """
-        raise NotImplementedError('FilteredRelation.resolve_expression() is unused.')
-
-    def as_sql(self, compiler, connection):
-        # Resolve the condition in Join.filtered_relation.
-        query = compiler.query
-        where = query.build_filtered_relation_q(self.condition, reuse=set(self.path))
-        return compiler.compile(where)
-
        
-
-          
        
-          
-        
        
-      
        
-      
-      
        
-    
        
-    
        
-      ©2017, CDH @ Princeton & Trustees of Princeton University.
-      
-      |
-      Powered by Sphinx 3.3.1
-      & Alabaster 0.7.12
-      
-    
        
-
-    
-
-    
-  
-
\ No newline at end of file
diff --git a/docs/_modules/django/utils/feedgenerator.html b/docs/_modules/django/utils/feedgenerator.html
deleted file mode 100644
index 7e09d3411..000000000
--- a/docs/_modules/django/utils/feedgenerator.html
+++ /dev/null
@@ -1,520 +0,0 @@
-
-
-
-
-  
-    
-    
-    django.utils.feedgenerator — CDH website 2.8.0 documentation
-    
-    
-    
-    
-    
-    
-    
-    
-    
-   
-  
-  
-  
-  
-
-  
-  
-
-    
        
-      
        
-        
        
-          
-
-          
        
-            
-  
        Source code for django.utils.feedgenerator
        -"""
-Syndication feed generation library -- used for generating RSS, etc.
-
-Sample usage:
-
->>> from django.utils import feedgenerator
->>> feed = feedgenerator.Rss201rev2Feed(
-...     title="Poynter E-Media Tidbits",
-...     link="http://www.poynter.org/column.asp?id=31",
-...     description="A group Weblog by the sharpest minds in online media/journalism/publishing.",
-...     language="en",
-... )
->>> feed.add_item(
-...     title="Hello",
-...     link="http://www.holovaty.com/test/",
-...     description="Testing."
-... )
->>> with open('test.rss', 'w') as fp:
-...     feed.write(fp, 'utf-8')
-
-For definitions of the different versions of RSS, see:
-https://web.archive.org/web/20110718035220/http://diveintomark.org/archives/2004/02/04/incompatible-rss
-"""
-import datetime
-import email
-from io import StringIO
-from urllib.parse import urlparse
-
-from django.utils.encoding import iri_to_uri
-from django.utils.timezone import utc
-from django.utils.xmlutils import SimplerXMLGenerator
-
-
-def rfc2822_date(date):
-    if not isinstance(date, datetime.datetime):
-        date = datetime.datetime.combine(date, datetime.time())
-    return email.utils.format_datetime(date)
-
-
-def rfc3339_date(date):
-    if not isinstance(date, datetime.datetime):
-        date = datetime.datetime.combine(date, datetime.time())
-    return date.isoformat() + ('Z' if date.utcoffset() is None else '')
-
-
-def get_tag_uri(url, date):
-    """
-    Create a TagURI.
-
-    See https://web.archive.org/web/20110514113830/http://diveintomark.org/archives/2004/05/28/howto-atom-id
-    """
-    bits = urlparse(url)
-    d = ''
-    if date is not None:
-        d = ',%s' % date.strftime('%Y-%m-%d')
-    return 'tag:%s%s:%s/%s' % (bits.hostname, d, bits.path, bits.fragment)
-
-
-class SyndicationFeed:
-    "Base class for all syndication feeds. Subclasses should provide write()"
-    def __init__(self, title, link, description, language=None, author_email=None,
-                 author_name=None, author_link=None, subtitle=None, categories=None,
-                 feed_url=None, feed_copyright=None, feed_guid=None, ttl=None, **kwargs):
-        def to_str(s):
-            return str(s) if s is not None else s
-        categories = categories and [str(c) for c in categories]
-        self.feed = {
-            'title': to_str(title),
-            'link': iri_to_uri(link),
-            'description': to_str(description),
-            'language': to_str(language),
-            'author_email': to_str(author_email),
-            'author_name': to_str(author_name),
-            'author_link': iri_to_uri(author_link),
-            'subtitle': to_str(subtitle),
-            'categories': categories or (),
-            'feed_url': iri_to_uri(feed_url),
-            'feed_copyright': to_str(feed_copyright),
-            'id': feed_guid or link,
-            'ttl': to_str(ttl),
-            **kwargs,
-        }
-        self.items = []
-
-    def add_item(self, title, link, description, author_email=None,
-                 author_name=None, author_link=None, pubdate=None, comments=None,
-                 unique_id=None, unique_id_is_permalink=None, categories=(),
-                 item_copyright=None, ttl=None, updateddate=None, enclosures=None, **kwargs):
-        """
-        Add an item to the feed. All args are expected to be strings except
-        pubdate and updateddate, which are datetime.datetime objects, and
-        enclosures, which is an iterable of instances of the Enclosure class.
-        """
-        def to_str(s):
-            return str(s) if s is not None else s
-        categories = categories and [to_str(c) for c in categories]
-        self.items.append({
-            'title': to_str(title),
-            'link': iri_to_uri(link),
-            'description': to_str(description),
-            'author_email': to_str(author_email),
-            'author_name': to_str(author_name),
-            'author_link': iri_to_uri(author_link),
-            'pubdate': pubdate,
-            'updateddate': updateddate,
-            'comments': to_str(comments),
-            'unique_id': to_str(unique_id),
-            'unique_id_is_permalink': unique_id_is_permalink,
-            'enclosures': enclosures or (),
-            'categories': categories or (),
-            'item_copyright': to_str(item_copyright),
-            'ttl': to_str(ttl),
-            **kwargs,
-        })
-
-    def num_items(self):
-        return len(self.items)
-
-    def root_attributes(self):
-        """
-        Return extra attributes to place on the root (i.e. feed/channel) element.
-        Called from write().
-        """
-        return {}
-
-    def add_root_elements(self, handler):
-        """
-        Add elements in the root (i.e. feed/channel) element. Called
-        from write().
-        """
-        pass
-
-    def item_attributes(self, item):
-        """
-        Return extra attributes to place on each item (i.e. item/entry) element.
-        """
-        return {}
-
-    def add_item_elements(self, handler, item):
-        """
-        Add elements on each item (i.e. item/entry) element.
-        """
-        pass
-
-    def write(self, outfile, encoding):
-        """
-        Output the feed in the given encoding to outfile, which is a file-like
-        object. Subclasses should override this.
-        """
-        raise NotImplementedError('subclasses of SyndicationFeed must provide a write() method')
-
-    def writeString(self, encoding):
-        """
-        Return the feed in the given encoding as a string.
-        """
-        s = StringIO()
-        self.write(s, encoding)
-        return s.getvalue()
-
-    def latest_post_date(self):
-        """
-        Return the latest item's pubdate or updateddate. If no items
-        have either of these attributes this return the current UTC date/time.
-        """
-        latest_date = None
-        date_keys = ('updateddate', 'pubdate')
-
-        for item in self.items:
-            for date_key in date_keys:
-                item_date = item.get(date_key)
-                if item_date:
-                    if latest_date is None or item_date > latest_date:
-                        latest_date = item_date
-
-        # datetime.now(tz=utc) is slower, as documented in django.utils.timezone.now
-        return latest_date or datetime.datetime.utcnow().replace(tzinfo=utc)
-
-
-class Enclosure:
-    """An RSS enclosure"""
-    def __init__(self, url, length, mime_type):
-        "All args are expected to be strings"
-        self.length, self.mime_type = length, mime_type
-        self.url = iri_to_uri(url)
-
-
-class RssFeed(SyndicationFeed):
-    content_type = 'application/rss+xml; charset=utf-8'
-
-    def write(self, outfile, encoding):
-        handler = SimplerXMLGenerator(outfile, encoding)
-        handler.startDocument()
-        handler.startElement("rss", self.rss_attributes())
-        handler.startElement("channel", self.root_attributes())
-        self.add_root_elements(handler)
-        self.write_items(handler)
-        self.endChannelElement(handler)
-        handler.endElement("rss")
-
-    def rss_attributes(self):
-        return {
-            'version': self._version,
-            'xmlns:atom': 'http://www.w3.org/2005/Atom',
-        }
-
-    def write_items(self, handler):
-        for item in self.items:
-            handler.startElement('item', self.item_attributes(item))
-            self.add_item_elements(handler, item)
-            handler.endElement("item")
-
-    def add_root_elements(self, handler):
-        handler.addQuickElement("title", self.feed['title'])
-        handler.addQuickElement("link", self.feed['link'])
-        handler.addQuickElement("description", self.feed['description'])
-        if self.feed['feed_url'] is not None:
-            handler.addQuickElement("atom:link", None, {"rel": "self", "href": self.feed['feed_url']})
-        if self.feed['language'] is not None:
-            handler.addQuickElement("language", self.feed['language'])
-        for cat in self.feed['categories']:
-            handler.addQuickElement("category", cat)
-        if self.feed['feed_copyright'] is not None:
-            handler.addQuickElement("copyright", self.feed['feed_copyright'])
-        handler.addQuickElement("lastBuildDate", rfc2822_date(self.latest_post_date()))
-        if self.feed['ttl'] is not None:
-            handler.addQuickElement("ttl", self.feed['ttl'])
-
-    def endChannelElement(self, handler):
-        handler.endElement("channel")
-
-
-class RssUserland091Feed(RssFeed):
-    _version = "0.91"
-
-    def add_item_elements(self, handler, item):
-        handler.addQuickElement("title", item['title'])
-        handler.addQuickElement("link", item['link'])
-        if item['description'] is not None:
-            handler.addQuickElement("description", item['description'])
-
-
-class Rss201rev2Feed(RssFeed):
-    # Spec: https://cyber.harvard.edu/rss/rss.html
-    _version = "2.0"
-
-    def add_item_elements(self, handler, item):
-        handler.addQuickElement("title", item['title'])
-        handler.addQuickElement("link", item['link'])
-        if item['description'] is not None:
-            handler.addQuickElement("description", item['description'])
-
-        # Author information.
-        if item["author_name"] and item["author_email"]:
-            handler.addQuickElement("author", "%s (%s)" % (item['author_email'], item['author_name']))
-        elif item["author_email"]:
-            handler.addQuickElement("author", item["author_email"])
-        elif item["author_name"]:
-            handler.addQuickElement(
-                "dc:creator", item["author_name"], {"xmlns:dc": "http://purl.org/dc/elements/1.1/"}
-            )
-
-        if item['pubdate'] is not None:
-            handler.addQuickElement("pubDate", rfc2822_date(item['pubdate']))
-        if item['comments'] is not None:
-            handler.addQuickElement("comments", item['comments'])
-        if item['unique_id'] is not None:
-            guid_attrs = {}
-            if isinstance(item.get('unique_id_is_permalink'), bool):
-                guid_attrs['isPermaLink'] = str(item['unique_id_is_permalink']).lower()
-            handler.addQuickElement("guid", item['unique_id'], guid_attrs)
-        if item['ttl'] is not None:
-            handler.addQuickElement("ttl", item['ttl'])
-
-        # Enclosure.
-        if item['enclosures']:
-            enclosures = list(item['enclosures'])
-            if len(enclosures) > 1:
-                raise ValueError(
-                    "RSS feed items may only have one enclosure, see "
-                    "http://www.rssboard.org/rss-profile#element-channel-item-enclosure"
-                )
-            enclosure = enclosures[0]
-            handler.addQuickElement('enclosure', '', {
-                'url': enclosure.url,
-                'length': enclosure.length,
-                'type': enclosure.mime_type,
-            })
-
-        # Categories.
-        for cat in item['categories']:
-            handler.addQuickElement("category", cat)
-
-
-class Atom1Feed(SyndicationFeed):
-    # Spec: https://tools.ietf.org/html/rfc4287
-    content_type = 'application/atom+xml; charset=utf-8'
-    ns = "http://www.w3.org/2005/Atom"
-
-    def write(self, outfile, encoding):
-        handler = SimplerXMLGenerator(outfile, encoding)
-        handler.startDocument()
-        handler.startElement('feed', self.root_attributes())
-        self.add_root_elements(handler)
-        self.write_items(handler)
-        handler.endElement("feed")
-
-    def root_attributes(self):
-        if self.feed['language'] is not None:
-            return {"xmlns": self.ns, "xml:lang": self.feed['language']}
-        else:
-            return {"xmlns": self.ns}
-
-    def add_root_elements(self, handler):
-        handler.addQuickElement("title", self.feed['title'])
-        handler.addQuickElement("link", "", {"rel": "alternate", "href": self.feed['link']})
-        if self.feed['feed_url'] is not None:
-            handler.addQuickElement("link", "", {"rel": "self", "href": self.feed['feed_url']})
-        handler.addQuickElement("id", self.feed['id'])
-        handler.addQuickElement("updated", rfc3339_date(self.latest_post_date()))
-        if self.feed['author_name'] is not None:
-            handler.startElement("author", {})
-            handler.addQuickElement("name", self.feed['author_name'])
-            if self.feed['author_email'] is not None:
-                handler.addQuickElement("email", self.feed['author_email'])
-            if self.feed['author_link'] is not None:
-                handler.addQuickElement("uri", self.feed['author_link'])
-            handler.endElement("author")
-        if self.feed['subtitle'] is not None:
-            handler.addQuickElement("subtitle", self.feed['subtitle'])
-        for cat in self.feed['categories']:
-            handler.addQuickElement("category", "", {"term": cat})
-        if self.feed['feed_copyright'] is not None:
-            handler.addQuickElement("rights", self.feed['feed_copyright'])
-
-    def write_items(self, handler):
-        for item in self.items:
-            handler.startElement("entry", self.item_attributes(item))
-            self.add_item_elements(handler, item)
-            handler.endElement("entry")
-
-    def add_item_elements(self, handler, item):
-        handler.addQuickElement("title", item['title'])
-        handler.addQuickElement("link", "", {"href": item['link'], "rel": "alternate"})
-
-        if item['pubdate'] is not None:
-            handler.addQuickElement('published', rfc3339_date(item['pubdate']))
-
-        if item['updateddate'] is not None:
-            handler.addQuickElement('updated', rfc3339_date(item['updateddate']))
-
-        # Author information.
-        if item['author_name'] is not None:
-            handler.startElement("author", {})
-            handler.addQuickElement("name", item['author_name'])
-            if item['author_email'] is not None:
-                handler.addQuickElement("email", item['author_email'])
-            if item['author_link'] is not None:
-                handler.addQuickElement("uri", item['author_link'])
-            handler.endElement("author")
-
-        # Unique ID.
-        if item['unique_id'] is not None:
-            unique_id = item['unique_id']
-        else:
-            unique_id = get_tag_uri(item['link'], item['pubdate'])
-        handler.addQuickElement("id", unique_id)
-
-        # Summary.
-        if item['description'] is not None:
-            handler.addQuickElement("summary", item['description'], {"type": "html"})
-
-        # Enclosures.
-        for enclosure in item['enclosures']:
-            handler.addQuickElement('link', '', {
-                'rel': 'enclosure',
-                'href': enclosure.url,
-                'length': enclosure.length,
-                'type': enclosure.mime_type,
-            })
-
-        # Categories.
-        for cat in item['categories']:
-            handler.addQuickElement("category", "", {"term": cat})
-
-        # Rights.
-        if item['item_copyright'] is not None:
-            handler.addQuickElement("rights", item['item_copyright'])
-
-
-# This isolates the decision of what the system default is, so calling code can
-# do "feedgenerator.DefaultFeed" instead of "feedgenerator.Rss201rev2Feed".
-DefaultFeed = Rss201rev2Feed
-
        
-
-          
        
-          
-        
        
-      
        
-      
-      
        
-    
        
-    
        
-      ©2017, CDH @ Princeton & Trustees of Princeton University.
-      
-      |
-      Powered by Sphinx 3.3.1
-      & Alabaster 0.7.12
-      
-    
        
-
-    
-
-    
-  
-
\ No newline at end of file
diff --git a/docs/_modules/index.html b/docs/_modules/index.html
index 446a4283c..4590b03c7 100644
--- a/docs/_modules/index.html
+++ b/docs/_modules/index.html
@@ -5,14 +5,13 @@
   
     
     
-    Overview: module code — CDH website 2.8.0 documentation
+    Overview: module code — CDH website 3.0.0 documentation
     
     
     
     
     
     
-    
     
     
    
@@ -41,8 +40,6 @@ 
        All modules for which code is available
        
 
      • cdhweb.projects.models
        • 
 
      • cdhweb.projects.views
        • 
 
      • cdhweb.resources.models
        • 
-
      • django.db.models.query_utils
        • 
-
      • django.utils.feedgenerator
        •
      @@ -127,7 +124,7 @@

      Quick search

      ©2017, CDH @ Princeton & Trustees of Princeton University. | - Powered by Sphinx 3.3.1 + Powered by Sphinx 3.5.3 & Alabaster 0.7.12
    diff --git a/docs/_sources/architecture.rst.txt b/docs/_sources/architecture.rst.txt index fdd8471cd..93f9532ef 100644 --- a/docs/_sources/architecture.rst.txt +++ b/docs/_sources/architecture.rst.txt @@ -8,7 +8,11 @@ Architecture Database -------- -Database Schema as rendered in DAVILA +As of version 2.8.1, `database documentation and diagrams are available via dbdocs `_. + +------ + +Older versions of the database schema as rendered by DAVILA. Overview ~~~~~~~~ diff --git a/docs/_static/basic.css b/docs/_static/basic.css index 24a49f09b..be19270e4 100644 --- a/docs/_static/basic.css +++ b/docs/_static/basic.css @@ -4,7 +4,7 @@ * * Sphinx stylesheet -- basic theme. * - * :copyright: Copyright 2007-2020 by the Sphinx team, see AUTHORS. + * :copyright: Copyright 2007-2021 by the Sphinx team, see AUTHORS. * :license: BSD, see LICENSE for details. * */ diff --git a/docs/_static/doctools.js b/docs/_static/doctools.js index 7d88f807d..61ac9d266 100644 --- a/docs/_static/doctools.js +++ b/docs/_static/doctools.js @@ -4,7 +4,7 @@ * * Sphinx JavaScript utilities for all documentation. * - * :copyright: Copyright 2007-2020 by the Sphinx team, see AUTHORS. + * :copyright: Copyright 2007-2021 by the Sphinx team, see AUTHORS. * :license: BSD, see LICENSE for details. * */ @@ -29,9 +29,14 @@ if (!window.console || !console.firebug) { /** * small helper function to urldecode strings + * + * See https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/decodeURIComponent#Decoding_query_parameters_from_a_URL */ jQuery.urldecode = function(x) { - return decodeURIComponent(x).replace(/\+/g, ' '); + if (!x) { + return x + } + return decodeURIComponent(x.replace(/\+/g, ' ')); }; /** diff --git a/docs/_static/documentation_options.js b/docs/_static/documentation_options.js index 793844b23..8d2a4675e 100644 --- a/docs/_static/documentation_options.js +++ b/docs/_static/documentation_options.js @@ -1,6 +1,6 @@ var DOCUMENTATION_OPTIONS = { URL_ROOT: document.getElementById("documentation_options").getAttribute('data-url_root'), - VERSION: '2.8.0', + VERSION: '3.0.0', LANGUAGE: 'None', COLLAPSE_INDEX: false, BUILDER: 'html', diff --git a/docs/_static/language_data.js b/docs/_static/language_data.js index d2b4ee91b..863704b31 100644 --- a/docs/_static/language_data.js +++ b/docs/_static/language_data.js @@ -5,7 +5,7 @@ * This script contains the language-specific data used by searchtools.js, * namely the list of stopwords, stemmer, scorer and splitter. * - * :copyright: Copyright 2007-2020 by the Sphinx team, see AUTHORS. + * :copyright: Copyright 2007-2021 by the Sphinx team, see AUTHORS. * :license: BSD, see LICENSE for details. * */ @@ -13,7 +13,8 @@ var stopwords = ["a","and","are","as","at","be","but","by","for","if","in","into","is","it","near","no","not","of","on","or","such","that","the","their","then","there","these","they","this","to","was","will","with"]; -/* Non-minified version JS is _stemmer.js if file is provided */ +/* Non-minified version is copied as a separate JS file, is available */ + /** * Porter Stemmer */ @@ -199,7 +200,6 @@ var Stemmer = function() { - var splitChars = (function() { var result = {}; var singles = [96, 180, 187, 191, 215, 247, 749, 885, 903, 907, 909, 930, 1014, 1648, diff --git a/docs/_static/pygments.css b/docs/_static/pygments.css index f346859c1..691aeb82d 100644 --- a/docs/_static/pygments.css +++ b/docs/_static/pygments.css @@ -1,7 +1,7 @@ -pre { line-height: 125%; margin: 0; } -td.linenos pre { color: #000000; background-color: #f0f0f0; padding-left: 5px; padding-right: 5px; } -span.linenos { color: #000000; background-color: #f0f0f0; padding-left: 5px; padding-right: 5px; } -td.linenos pre.special { color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px; } +pre { line-height: 125%; } +td.linenos .normal { color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px; } +span.linenos { color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px; } +td.linenos .special { color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px; } span.linenos.special { color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px; } .highlight .hll { background-color: #ffffcc } .highlight { background: #eeffcc; } diff --git a/docs/_static/searchtools.js b/docs/_static/searchtools.js index 261ecaa92..1a90152eb 100644 --- a/docs/_static/searchtools.js +++ b/docs/_static/searchtools.js @@ -4,7 +4,7 @@ * * Sphinx JavaScript utilities for the full-text search. * - * :copyright: Copyright 2007-2020 by the Sphinx team, see AUTHORS. + * :copyright: Copyright 2007-2021 by the Sphinx team, see AUTHORS. * :license: BSD, see LICENSE for details. * */ @@ -248,7 +248,7 @@ var Search = { // results left, load the summary and display it if (results.length) { var item = results.pop(); - var listItem = $('
  • '); + var listItem = $('
  • '); var requestUrl = ""; var linkUrl = ""; if (DOCUMENTATION_OPTIONS.BUILDER === 'dirhtml') { @@ -273,9 +273,9 @@ var Search = { if (item[3]) { listItem.append($(' (' + item[3] + ')')); Search.output.append(listItem); - listItem.slideDown(5, function() { + setTimeout(function() { displayNextItem(); - }); + }, 5); } else if (DOCUMENTATION_OPTIONS.HAS_SOURCE) { $.ajax({url: requestUrl, dataType: "text", @@ -285,16 +285,16 @@ var Search = { listItem.append(Search.makeSearchSummary(data, searchterms, hlterms)); } Search.output.append(listItem); - listItem.slideDown(5, function() { + setTimeout(function() { displayNextItem(); - }); + }, 5); }}); } else { // no source available, just display title Search.output.append(listItem); - listItem.slideDown(5, function() { + setTimeout(function() { displayNextItem(); - }); + }, 5); } } // search finished, update title and status message @@ -379,6 +379,13 @@ var Search = { return results; }, + /** + * See https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_Expressions + */ + escapeRegExp : function(string) { + return string.replace(/[.*+\-?^${}()|[\]\\]/g, '\\$&'); // $& means the whole matched string + }, + /** * search for full-text terms in the index */ @@ -402,13 +409,14 @@ var Search = { ]; // add support for partial matches if (word.length > 2) { + var word_regex = this.escapeRegExp(word); for (var w in terms) { - if (w.match(word) && !terms[word]) { + if (w.match(word_regex) && !terms[word]) { _o.push({files: terms[w], score: Scorer.partialTerm}) } } for (var w in titleterms) { - if (w.match(word) && !titleterms[word]) { + if (w.match(word_regex) && !titleterms[word]) { _o.push({files: titleterms[w], score: Scorer.partialTitle}) } } diff --git a/docs/_static/underscore-1.12.0.js b/docs/_static/underscore-1.12.0.js new file mode 100644 index 000000000..3af6352e6 --- /dev/null +++ b/docs/_static/underscore-1.12.0.js @@ -0,0 +1,2027 @@ +(function (global, factory) { + typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() : + typeof define === 'function' && define.amd ? define('underscore', factory) : + (global = global || self, (function () { + var current = global._; + var exports = global._ = factory(); + exports.noConflict = function () { global._ = current; return exports; }; + }())); +}(this, (function () { + // Underscore.js 1.12.0 + // https://underscorejs.org + // (c) 2009-2020 Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors + // Underscore may be freely distributed under the MIT license. + + // Current version. + var VERSION = '1.12.0'; + + // Establish the root object, `window` (`self`) in the browser, `global` + // on the server, or `this` in some virtual machines. We use `self` + // instead of `window` for `WebWorker` support. + var root = typeof self == 'object' && self.self === self && self || + typeof global == 'object' && global.global === global && global || + Function('return this')() || + {}; + + // Save bytes in the minified (but not gzipped) version: + var ArrayProto = Array.prototype, ObjProto = Object.prototype; + var SymbolProto = typeof Symbol !== 'undefined' ? Symbol.prototype : null; + + // Create quick reference variables for speed access to core prototypes. + var push = ArrayProto.push, + slice = ArrayProto.slice, + toString = ObjProto.toString, + hasOwnProperty = ObjProto.hasOwnProperty; + + // Modern feature detection. + var supportsArrayBuffer = typeof ArrayBuffer !== 'undefined', + supportsDataView = typeof DataView !== 'undefined'; + + // All **ECMAScript 5+** native function implementations that we hope to use + // are declared here. + var nativeIsArray = Array.isArray, + nativeKeys = Object.keys, + nativeCreate = Object.create, + nativeIsView = supportsArrayBuffer && ArrayBuffer.isView; + + // Create references to these builtin functions because we override them. + var _isNaN = isNaN, + _isFinite = isFinite; + + // Keys in IE < 9 that won't be iterated by `for key in ...` and thus missed. + var hasEnumBug = !{toString: null}.propertyIsEnumerable('toString'); + var nonEnumerableProps = ['valueOf', 'isPrototypeOf', 'toString', + 'propertyIsEnumerable', 'hasOwnProperty', 'toLocaleString']; + + // The largest integer that can be represented exactly. + var MAX_ARRAY_INDEX = Math.pow(2, 53) - 1; + + // Some functions take a variable number of arguments, or a few expected + // arguments at the beginning and then a variable number of values to operate + // on. This helper accumulates all remaining arguments past the function’s + // argument length (or an explicit `startIndex`), into an array that becomes + // the last argument. Similar to ES6’s "rest parameter". + function restArguments(func, startIndex) { + startIndex = startIndex == null ? func.length - 1 : +startIndex; + return function() { + var length = Math.max(arguments.length - startIndex, 0), + rest = Array(length), + index = 0; + for (; index < length; index++) { + rest[index] = arguments[index + startIndex]; + } + switch (startIndex) { + case 0: return func.call(this, rest); + case 1: return func.call(this, arguments[0], rest); + case 2: return func.call(this, arguments[0], arguments[1], rest); + } + var args = Array(startIndex + 1); + for (index = 0; index < startIndex; index++) { + args[index] = arguments[index]; + } + args[startIndex] = rest; + return func.apply(this, args); + }; + } + + // Is a given variable an object? + function isObject(obj) { + var type = typeof obj; + return type === 'function' || type === 'object' && !!obj; + } + + // Is a given value equal to null? + function isNull(obj) { + return obj === null; + } + + // Is a given variable undefined? + function isUndefined(obj) { + return obj === void 0; + } + + // Is a given value a boolean? + function isBoolean(obj) { + return obj === true || obj === false || toString.call(obj) === '[object Boolean]'; + } + + // Is a given value a DOM element? + function isElement(obj) { + return !!(obj && obj.nodeType === 1); + } + + // Internal function for creating a `toString`-based type tester. + function tagTester(name) { + var tag = '[object ' + name + ']'; + return function(obj) { + return toString.call(obj) === tag; + }; + } + + var isString = tagTester('String'); + + var isNumber = tagTester('Number'); + + var isDate = tagTester('Date'); + + var isRegExp = tagTester('RegExp'); + + var isError = tagTester('Error'); + + var isSymbol = tagTester('Symbol'); + + var isArrayBuffer = tagTester('ArrayBuffer'); + + var isFunction = tagTester('Function'); + + // Optimize `isFunction` if appropriate. Work around some `typeof` bugs in old + // v8, IE 11 (#1621), Safari 8 (#1929), and PhantomJS (#2236). + var nodelist = root.document && root.document.childNodes; + if (typeof /./ != 'function' && typeof Int8Array != 'object' && typeof nodelist != 'function') { + isFunction = function(obj) { + return typeof obj == 'function' || false; + }; + } + + var isFunction$1 = isFunction; + + var hasObjectTag = tagTester('Object'); + + // In IE 10 - Edge 13, `DataView` has string tag `'[object Object]'`. + // In IE 11, the most common among them, this problem also applies to + // `Map`, `WeakMap` and `Set`. + var hasStringTagBug = ( + supportsDataView && hasObjectTag(new DataView(new ArrayBuffer(8))) + ), + isIE11 = (typeof Map !== 'undefined' && hasObjectTag(new Map)); + + var isDataView = tagTester('DataView'); + + // In IE 10 - Edge 13, we need a different heuristic + // to determine whether an object is a `DataView`. + function ie10IsDataView(obj) { + return obj != null && isFunction$1(obj.getInt8) && isArrayBuffer(obj.buffer); + } + + var isDataView$1 = (hasStringTagBug ? ie10IsDataView : isDataView); + + // Is a given value an array? + // Delegates to ECMA5's native `Array.isArray`. + var isArray = nativeIsArray || tagTester('Array'); + + // Internal function to check whether `key` is an own property name of `obj`. + function has(obj, key) { + return obj != null && hasOwnProperty.call(obj, key); + } + + var isArguments = tagTester('Arguments'); + + // Define a fallback version of the method in browsers (ahem, IE < 9), where + // there isn't any inspectable "Arguments" type. + (function() { + if (!isArguments(arguments)) { + isArguments = function(obj) { + return has(obj, 'callee'); + }; + } + }()); + + var isArguments$1 = isArguments; + + // Is a given object a finite number? + function isFinite$1(obj) { + return !isSymbol(obj) && _isFinite(obj) && !isNaN(parseFloat(obj)); + } + + // Is the given value `NaN`? + function isNaN$1(obj) { + return isNumber(obj) && _isNaN(obj); + } + + // Predicate-generating function. Often useful outside of Underscore. + function constant(value) { + return function() { + return value; + }; + } + + // Common internal logic for `isArrayLike` and `isBufferLike`. + function createSizePropertyCheck(getSizeProperty) { + return function(collection) { + var sizeProperty = getSizeProperty(collection); + return typeof sizeProperty == 'number' && sizeProperty >= 0 && sizeProperty <= MAX_ARRAY_INDEX; + } + } + + // Internal helper to generate a function to obtain property `key` from `obj`. + function shallowProperty(key) { + return function(obj) { + return obj == null ? void 0 : obj[key]; + }; + } + + // Internal helper to obtain the `byteLength` property of an object. + var getByteLength = shallowProperty('byteLength'); + + // Internal helper to determine whether we should spend extensive checks against + // `ArrayBuffer` et al. + var isBufferLike = createSizePropertyCheck(getByteLength); + + // Is a given value a typed array? + var typedArrayPattern = /\[object ((I|Ui)nt(8|16|32)|Float(32|64)|Uint8Clamped|Big(I|Ui)nt64)Array\]/; + function isTypedArray(obj) { + // `ArrayBuffer.isView` is the most future-proof, so use it when available. + // Otherwise, fall back on the above regular expression. + return nativeIsView ? (nativeIsView(obj) && !isDataView$1(obj)) : + isBufferLike(obj) && typedArrayPattern.test(toString.call(obj)); + } + + var isTypedArray$1 = supportsArrayBuffer ? isTypedArray : constant(false); + + // Internal helper to obtain the `length` property of an object. + var getLength = shallowProperty('length'); + + // Internal helper to create a simple lookup structure. + // `collectNonEnumProps` used to depend on `_.contains`, but this led to + // circular imports. `emulatedSet` is a one-off solution that only works for + // arrays of strings. + function emulatedSet(keys) { + var hash = {}; + for (var l = keys.length, i = 0; i < l; ++i) hash[keys[i]] = true; + return { + contains: function(key) { return hash[key]; }, + push: function(key) { + hash[key] = true; + return keys.push(key); + } + }; + } + + // Internal helper. Checks `keys` for the presence of keys in IE < 9 that won't + // be iterated by `for key in ...` and thus missed. Extends `keys` in place if + // needed. + function collectNonEnumProps(obj, keys) { + keys = emulatedSet(keys); + var nonEnumIdx = nonEnumerableProps.length; + var constructor = obj.constructor; + var proto = isFunction$1(constructor) && constructor.prototype || ObjProto; + + // Constructor is a special case. + var prop = 'constructor'; + if (has(obj, prop) && !keys.contains(prop)) keys.push(prop); + + while (nonEnumIdx--) { + prop = nonEnumerableProps[nonEnumIdx]; + if (prop in obj && obj[prop] !== proto[prop] && !keys.contains(prop)) { + keys.push(prop); + } + } + } + + // Retrieve the names of an object's own properties. + // Delegates to **ECMAScript 5**'s native `Object.keys`. + function keys(obj) { + if (!isObject(obj)) return []; + if (nativeKeys) return nativeKeys(obj); + var keys = []; + for (var key in obj) if (has(obj, key)) keys.push(key); + // Ahem, IE < 9. + if (hasEnumBug) collectNonEnumProps(obj, keys); + return keys; + } + + // Is a given array, string, or object empty? + // An "empty" object has no enumerable own-properties. + function isEmpty(obj) { + if (obj == null) return true; + // Skip the more expensive `toString`-based type checks if `obj` has no + // `.length`. + var length = getLength(obj); + if (typeof length == 'number' && ( + isArray(obj) || isString(obj) || isArguments$1(obj) + )) return length === 0; + return getLength(keys(obj)) === 0; + } + + // Returns whether an object has a given set of `key:value` pairs. + function isMatch(object, attrs) { + var _keys = keys(attrs), length = _keys.length; + if (object == null) return !length; + var obj = Object(object); + for (var i = 0; i < length; i++) { + var key = _keys[i]; + if (attrs[key] !== obj[key] || !(key in obj)) return false; + } + return true; + } + + // If Underscore is called as a function, it returns a wrapped object that can + // be used OO-style. This wrapper holds altered versions of all functions added + // through `_.mixin`. Wrapped objects may be chained. + function _(obj) { + if (obj instanceof _) return obj; + if (!(this instanceof _)) return new _(obj); + this._wrapped = obj; + } + + _.VERSION = VERSION; + + // Extracts the result from a wrapped and chained object. + _.prototype.value = function() { + return this._wrapped; + }; + + // Provide unwrapping proxies for some methods used in engine operations + // such as arithmetic and JSON stringification. + _.prototype.valueOf = _.prototype.toJSON = _.prototype.value; + + _.prototype.toString = function() { + return String(this._wrapped); + }; + + // Internal function to wrap or shallow-copy an ArrayBuffer, + // typed array or DataView to a new view, reusing the buffer. + function toBufferView(bufferSource) { + return new Uint8Array( + bufferSource.buffer || bufferSource, + bufferSource.byteOffset || 0, + getByteLength(bufferSource) + ); + } + + // We use this string twice, so give it a name for minification. + var tagDataView = '[object DataView]'; + + // Internal recursive comparison function for `_.isEqual`. + function eq(a, b, aStack, bStack) { + // Identical objects are equal. `0 === -0`, but they aren't identical. + // See the [Harmony `egal` proposal](https://wiki.ecmascript.org/doku.php?id=harmony:egal). + if (a === b) return a !== 0 || 1 / a === 1 / b; + // `null` or `undefined` only equal to itself (strict comparison). + if (a == null || b == null) return false; + // `NaN`s are equivalent, but non-reflexive. + if (a !== a) return b !== b; + // Exhaust primitive checks + var type = typeof a; + if (type !== 'function' && type !== 'object' && typeof b != 'object') return false; + return deepEq(a, b, aStack, bStack); + } + + // Internal recursive comparison function for `_.isEqual`. + function deepEq(a, b, aStack, bStack) { + // Unwrap any wrapped objects. + if (a instanceof _) a = a._wrapped; + if (b instanceof _) b = b._wrapped; + // Compare `[[Class]]` names. + var className = toString.call(a); + if (className !== toString.call(b)) return false; + // Work around a bug in IE 10 - Edge 13. + if (hasStringTagBug && className == '[object Object]' && isDataView$1(a)) { + if (!isDataView$1(b)) return false; + className = tagDataView; + } + switch (className) { + // These types are compared by value. + case '[object RegExp]': + // RegExps are coerced to strings for comparison (Note: '' + /a/i === '/a/i') + case '[object String]': + // Primitives and their corresponding object wrappers are equivalent; thus, `"5"` is + // equivalent to `new String("5")`. + return '' + a === '' + b; + case '[object Number]': + // `NaN`s are equivalent, but non-reflexive. + // Object(NaN) is equivalent to NaN. + if (+a !== +a) return +b !== +b; + // An `egal` comparison is performed for other numeric values. + return +a === 0 ? 1 / +a === 1 / b : +a === +b; + case '[object Date]': + case '[object Boolean]': + // Coerce dates and booleans to numeric primitive values. Dates are compared by their + // millisecond representations. Note that invalid dates with millisecond representations + // of `NaN` are not equivalent. + return +a === +b; + case '[object Symbol]': + return SymbolProto.valueOf.call(a) === SymbolProto.valueOf.call(b); + case '[object ArrayBuffer]': + case tagDataView: + // Coerce to typed array so we can fall through. + return deepEq(toBufferView(a), toBufferView(b), aStack, bStack); + } + + var areArrays = className === '[object Array]'; + if (!areArrays && isTypedArray$1(a)) { + var byteLength = getByteLength(a); + if (byteLength !== getByteLength(b)) return false; + if (a.buffer === b.buffer && a.byteOffset === b.byteOffset) return true; + areArrays = true; + } + if (!areArrays) { + if (typeof a != 'object' || typeof b != 'object') return false; + + // Objects with different constructors are not equivalent, but `Object`s or `Array`s + // from different frames are. + var aCtor = a.constructor, bCtor = b.constructor; + if (aCtor !== bCtor && !(isFunction$1(aCtor) && aCtor instanceof aCtor && + isFunction$1(bCtor) && bCtor instanceof bCtor) + && ('constructor' in a && 'constructor' in b)) { + return false; + } + } + // Assume equality for cyclic structures. The algorithm for detecting cyclic + // structures is adapted from ES 5.1 section 15.12.3, abstract operation `JO`. + + // Initializing stack of traversed objects. + // It's done here since we only need them for objects and arrays comparison. + aStack = aStack || []; + bStack = bStack || []; + var length = aStack.length; + while (length--) { + // Linear search. Performance is inversely proportional to the number of + // unique nested structures. + if (aStack[length] === a) return bStack[length] === b; + } + + // Add the first object to the stack of traversed objects. + aStack.push(a); + bStack.push(b); + + // Recursively compare objects and arrays. + if (areArrays) { + // Compare array lengths to determine if a deep comparison is necessary. + length = a.length; + if (length !== b.length) return false; + // Deep compare the contents, ignoring non-numeric properties. + while (length--) { + if (!eq(a[length], b[length], aStack, bStack)) return false; + } + } else { + // Deep compare objects. + var _keys = keys(a), key; + length = _keys.length; + // Ensure that both objects contain the same number of properties before comparing deep equality. + if (keys(b).length !== length) return false; + while (length--) { + // Deep compare each member + key = _keys[length]; + if (!(has(b, key) && eq(a[key], b[key], aStack, bStack))) return false; + } + } + // Remove the first object from the stack of traversed objects. + aStack.pop(); + bStack.pop(); + return true; + } + + // Perform a deep comparison to check if two objects are equal. + function isEqual(a, b) { + return eq(a, b); + } + + // Retrieve all the enumerable property names of an object. + function allKeys(obj) { + if (!isObject(obj)) return []; + var keys = []; + for (var key in obj) keys.push(key); + // Ahem, IE < 9. + if (hasEnumBug) collectNonEnumProps(obj, keys); + return keys; + } + + // Since the regular `Object.prototype.toString` type tests don't work for + // some types in IE 11, we use a fingerprinting heuristic instead, based + // on the methods. It's not great, but it's the best we got. + // The fingerprint method lists are defined below. + function ie11fingerprint(methods) { + var length = getLength(methods); + return function(obj) { + if (obj == null) return false; + // `Map`, `WeakMap` and `Set` have no enumerable keys. + var keys = allKeys(obj); + if (getLength(keys)) return false; + for (var i = 0; i < length; i++) { + if (!isFunction$1(obj[methods[i]])) return false; + } + // If we are testing against `WeakMap`, we need to ensure that + // `obj` doesn't have a `forEach` method in order to distinguish + // it from a regular `Map`. + return methods !== weakMapMethods || !isFunction$1(obj[forEachName]); + }; + } + + // In the interest of compact minification, we write + // each string in the fingerprints only once. + var forEachName = 'forEach', + hasName = 'has', + commonInit = ['clear', 'delete'], + mapTail = ['get', hasName, 'set']; + + // `Map`, `WeakMap` and `Set` each have slightly different + // combinations of the above sublists. + var mapMethods = commonInit.concat(forEachName, mapTail), + weakMapMethods = commonInit.concat(mapTail), + setMethods = ['add'].concat(commonInit, forEachName, hasName); + + var isMap = isIE11 ? ie11fingerprint(mapMethods) : tagTester('Map'); + + var isWeakMap = isIE11 ? ie11fingerprint(weakMapMethods) : tagTester('WeakMap'); + + var isSet = isIE11 ? ie11fingerprint(setMethods) : tagTester('Set'); + + var isWeakSet = tagTester('WeakSet'); + + // Retrieve the values of an object's properties. + function values(obj) { + var _keys = keys(obj); + var length = _keys.length; + var values = Array(length); + for (var i = 0; i < length; i++) { + values[i] = obj[_keys[i]]; + } + return values; + } + + // Convert an object into a list of `[key, value]` pairs. + // The opposite of `_.object` with one argument. + function pairs(obj) { + var _keys = keys(obj); + var length = _keys.length; + var pairs = Array(length); + for (var i = 0; i < length; i++) { + pairs[i] = [_keys[i], obj[_keys[i]]]; + } + return pairs; + } + + // Invert the keys and values of an object. The values must be serializable. + function invert(obj) { + var result = {}; + var _keys = keys(obj); + for (var i = 0, length = _keys.length; i < length; i++) { + result[obj[_keys[i]]] = _keys[i]; + } + return result; + } + + // Return a sorted list of the function names available on the object. + function functions(obj) { + var names = []; + for (var key in obj) { + if (isFunction$1(obj[key])) names.push(key); + } + return names.sort(); + } + + // An internal function for creating assigner functions. + function createAssigner(keysFunc, defaults) { + return function(obj) { + var length = arguments.length; + if (defaults) obj = Object(obj); + if (length < 2 || obj == null) return obj; + for (var index = 1; index < length; index++) { + var source = arguments[index], + keys = keysFunc(source), + l = keys.length; + for (var i = 0; i < l; i++) { + var key = keys[i]; + if (!defaults || obj[key] === void 0) obj[key] = source[key]; + } + } + return obj; + }; + } + + // Extend a given object with all the properties in passed-in object(s). + var extend = createAssigner(allKeys); + + // Assigns a given object with all the own properties in the passed-in + // object(s). + // (https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object/assign) + var extendOwn = createAssigner(keys); + + // Fill in a given object with default properties. + var defaults = createAssigner(allKeys, true); + + // Create a naked function reference for surrogate-prototype-swapping. + function ctor() { + return function(){}; + } + + // An internal function for creating a new object that inherits from another. + function baseCreate(prototype) { + if (!isObject(prototype)) return {}; + if (nativeCreate) return nativeCreate(prototype); + var Ctor = ctor(); + Ctor.prototype = prototype; + var result = new Ctor; + Ctor.prototype = null; + return result; + } + + // Creates an object that inherits from the given prototype object. + // If additional properties are provided then they will be added to the + // created object. + function create(prototype, props) { + var result = baseCreate(prototype); + if (props) extendOwn(result, props); + return result; + } + + // Create a (shallow-cloned) duplicate of an object. + function clone(obj) { + if (!isObject(obj)) return obj; + return isArray(obj) ? obj.slice() : extend({}, obj); + } + + // Invokes `interceptor` with the `obj` and then returns `obj`. + // The primary purpose of this method is to "tap into" a method chain, in + // order to perform operations on intermediate results within the chain. + function tap(obj, interceptor) { + interceptor(obj); + return obj; + } + + // Normalize a (deep) property `path` to array. + // Like `_.iteratee`, this function can be customized. + function toPath(path) { + return isArray(path) ? path : [path]; + } + _.toPath = toPath; + + // Internal wrapper for `_.toPath` to enable minification. + // Similar to `cb` for `_.iteratee`. + function toPath$1(path) { + return _.toPath(path); + } + + // Internal function to obtain a nested property in `obj` along `path`. + function deepGet(obj, path) { + var length = path.length; + for (var i = 0; i < length; i++) { + if (obj == null) return void 0; + obj = obj[path[i]]; + } + return length ? obj : void 0; + } + + // Get the value of the (deep) property on `path` from `object`. + // If any property in `path` does not exist or if the value is + // `undefined`, return `defaultValue` instead. + // The `path` is normalized through `_.toPath`. + function get(object, path, defaultValue) { + var value = deepGet(object, toPath$1(path)); + return isUndefined(value) ? defaultValue : value; + } + + // Shortcut function for checking if an object has a given property directly on + // itself (in other words, not on a prototype). Unlike the internal `has` + // function, this public version can also traverse nested properties. + function has$1(obj, path) { + path = toPath$1(path); + var length = path.length; + for (var i = 0; i < length; i++) { + var key = path[i]; + if (!has(obj, key)) return false; + obj = obj[key]; + } + return !!length; + } + + // Keep the identity function around for default iteratees. + function identity(value) { + return value; + } + + // Returns a predicate for checking whether an object has a given set of + // `key:value` pairs. + function matcher(attrs) { + attrs = extendOwn({}, attrs); + return function(obj) { + return isMatch(obj, attrs); + }; + } + + // Creates a function that, when passed an object, will traverse that object’s + // properties down the given `path`, specified as an array of keys or indices. + function property(path) { + path = toPath$1(path); + return function(obj) { + return deepGet(obj, path); + }; + } + + // Internal function that returns an efficient (for current engines) version + // of the passed-in callback, to be repeatedly applied in other Underscore + // functions. + function optimizeCb(func, context, argCount) { + if (context === void 0) return func; + switch (argCount == null ? 3 : argCount) { + case 1: return function(value) { + return func.call(context, value); + }; + // The 2-argument case is omitted because we’re not using it. + case 3: return function(value, index, collection) { + return func.call(context, value, index, collection); + }; + case 4: return function(accumulator, value, index, collection) { + return func.call(context, accumulator, value, index, collection); + }; + } + return function() { + return func.apply(context, arguments); + }; + } + + // An internal function to generate callbacks that can be applied to each + // element in a collection, returning the desired result — either `_.identity`, + // an arbitrary callback, a property matcher, or a property accessor. + function baseIteratee(value, context, argCount) { + if (value == null) return identity; + if (isFunction$1(value)) return optimizeCb(value, context, argCount); + if (isObject(value) && !isArray(value)) return matcher(value); + return property(value); + } + + // External wrapper for our callback generator. Users may customize + // `_.iteratee` if they want additional predicate/iteratee shorthand styles. + // This abstraction hides the internal-only `argCount` argument. + function iteratee(value, context) { + return baseIteratee(value, context, Infinity); + } + _.iteratee = iteratee; + + // The function we call internally to generate a callback. It invokes + // `_.iteratee` if overridden, otherwise `baseIteratee`. + function cb(value, context, argCount) { + if (_.iteratee !== iteratee) return _.iteratee(value, context); + return baseIteratee(value, context, argCount); + } + + // Returns the results of applying the `iteratee` to each element of `obj`. + // In contrast to `_.map` it returns an object. + function mapObject(obj, iteratee, context) { + iteratee = cb(iteratee, context); + var _keys = keys(obj), + length = _keys.length, + results = {}; + for (var index = 0; index < length; index++) { + var currentKey = _keys[index]; + results[currentKey] = iteratee(obj[currentKey], currentKey, obj); + } + return results; + } + + // Predicate-generating function. Often useful outside of Underscore. + function noop(){} + + // Generates a function for a given object that returns a given property. + function propertyOf(obj) { + if (obj == null) return noop; + return function(path) { + return get(obj, path); + }; + } + + // Run a function **n** times. + function times(n, iteratee, context) { + var accum = Array(Math.max(0, n)); + iteratee = optimizeCb(iteratee, context, 1); + for (var i = 0; i < n; i++) accum[i] = iteratee(i); + return accum; + } + + // Return a random integer between `min` and `max` (inclusive). + function random(min, max) { + if (max == null) { + max = min; + min = 0; + } + return min + Math.floor(Math.random() * (max - min + 1)); + } + + // A (possibly faster) way to get the current timestamp as an integer. + var now = Date.now || function() { + return new Date().getTime(); + }; + + // Internal helper to generate functions for escaping and unescaping strings + // to/from HTML interpolation. + function createEscaper(map) { + var escaper = function(match) { + return map[match]; + }; + // Regexes for identifying a key that needs to be escaped. + var source = '(?:' + keys(map).join('|') + ')'; + var testRegexp = RegExp(source); + var replaceRegexp = RegExp(source, 'g'); + return function(string) { + string = string == null ? '' : '' + string; + return testRegexp.test(string) ? string.replace(replaceRegexp, escaper) : string; + }; + } + + // Internal list of HTML entities for escaping. + var escapeMap = { + '&': '&', + '<': '<', + '>': '>', + '"': '"', + "'": ''', + '`': '`' + }; + + // Function for escaping strings to HTML interpolation. + var _escape = createEscaper(escapeMap); + + // Internal list of HTML entities for unescaping. + var unescapeMap = invert(escapeMap); + + // Function for unescaping strings from HTML interpolation. + var _unescape = createEscaper(unescapeMap); + + // By default, Underscore uses ERB-style template delimiters. Change the + // following template settings to use alternative delimiters. + var templateSettings = _.templateSettings = { + evaluate: /<%([\s\S]+?)%>/g, + interpolate: /<%=([\s\S]+?)%>/g, + escape: /<%-([\s\S]+?)%>/g + }; + + // When customizing `_.templateSettings`, if you don't want to define an + // interpolation, evaluation or escaping regex, we need one that is + // guaranteed not to match. + var noMatch = /(.)^/; + + // Certain characters need to be escaped so that they can be put into a + // string literal. + var escapes = { + "'": "'", + '\\': '\\', + '\r': 'r', + '\n': 'n', + '\u2028': 'u2028', + '\u2029': 'u2029' + }; + + var escapeRegExp = /\\|'|\r|\n|\u2028|\u2029/g; + + function escapeChar(match) { + return '\\' + escapes[match]; + } + + // JavaScript micro-templating, similar to John Resig's implementation. + // Underscore templating handles arbitrary delimiters, preserves whitespace, + // and correctly escapes quotes within interpolated code. + // NB: `oldSettings` only exists for backwards compatibility. + function template(text, settings, oldSettings) { + if (!settings && oldSettings) settings = oldSettings; + settings = defaults({}, settings, _.templateSettings); + + // Combine delimiters into one regular expression via alternation. + var matcher = RegExp([ + (settings.escape || noMatch).source, + (settings.interpolate || noMatch).source, + (settings.evaluate || noMatch).source + ].join('|') + '|$', 'g'); + + // Compile the template source, escaping string literals appropriately. + var index = 0; + var source = "__p+='"; + text.replace(matcher, function(match, escape, interpolate, evaluate, offset) { + source += text.slice(index, offset).replace(escapeRegExp, escapeChar); + index = offset + match.length; + + if (escape) { + source += "'+\n((__t=(" + escape + "))==null?'':_.escape(__t))+\n'"; + } else if (interpolate) { + source += "'+\n((__t=(" + interpolate + "))==null?'':__t)+\n'"; + } else if (evaluate) { + source += "';\n" + evaluate + "\n__p+='"; + } + + // Adobe VMs need the match returned to produce the correct offset. + return match; + }); + source += "';\n"; + + // If a variable is not specified, place data values in local scope. + if (!settings.variable) source = 'with(obj||{}){\n' + source + '}\n'; + + source = "var __t,__p='',__j=Array.prototype.join," + + "print=function(){__p+=__j.call(arguments,'');};\n" + + source + 'return __p;\n'; + + var render; + try { + render = new Function(settings.variable || 'obj', '_', source); + } catch (e) { + e.source = source; + throw e; + } + + var template = function(data) { + return render.call(this, data, _); + }; + + // Provide the compiled source as a convenience for precompilation. + var argument = settings.variable || 'obj'; + template.source = 'function(' + argument + '){\n' + source + '}'; + + return template; + } + + // Traverses the children of `obj` along `path`. If a child is a function, it + // is invoked with its parent as context. Returns the value of the final + // child, or `fallback` if any child is undefined. + function result(obj, path, fallback) { + path = toPath$1(path); + var length = path.length; + if (!length) { + return isFunction$1(fallback) ? fallback.call(obj) : fallback; + } + for (var i = 0; i < length; i++) { + var prop = obj == null ? void 0 : obj[path[i]]; + if (prop === void 0) { + prop = fallback; + i = length; // Ensure we don't continue iterating. + } + obj = isFunction$1(prop) ? prop.call(obj) : prop; + } + return obj; + } + + // Generate a unique integer id (unique within the entire client session). + // Useful for temporary DOM ids. + var idCounter = 0; + function uniqueId(prefix) { + var id = ++idCounter + ''; + return prefix ? prefix + id : id; + } + + // Start chaining a wrapped Underscore object. + function chain(obj) { + var instance = _(obj); + instance._chain = true; + return instance; + } + + // Internal function to execute `sourceFunc` bound to `context` with optional + // `args`. Determines whether to execute a function as a constructor or as a + // normal function. + function executeBound(sourceFunc, boundFunc, context, callingContext, args) { + if (!(callingContext instanceof boundFunc)) return sourceFunc.apply(context, args); + var self = baseCreate(sourceFunc.prototype); + var result = sourceFunc.apply(self, args); + if (isObject(result)) return result; + return self; + } + + // Partially apply a function by creating a version that has had some of its + // arguments pre-filled, without changing its dynamic `this` context. `_` acts + // as a placeholder by default, allowing any combination of arguments to be + // pre-filled. Set `_.partial.placeholder` for a custom placeholder argument. + var partial = restArguments(function(func, boundArgs) { + var placeholder = partial.placeholder; + var bound = function() { + var position = 0, length = boundArgs.length; + var args = Array(length); + for (var i = 0; i < length; i++) { + args[i] = boundArgs[i] === placeholder ? arguments[position++] : boundArgs[i]; + } + while (position < arguments.length) args.push(arguments[position++]); + return executeBound(func, bound, this, this, args); + }; + return bound; + }); + + partial.placeholder = _; + + // Create a function bound to a given object (assigning `this`, and arguments, + // optionally). + var bind = restArguments(function(func, context, args) { + if (!isFunction$1(func)) throw new TypeError('Bind must be called on a function'); + var bound = restArguments(function(callArgs) { + return executeBound(func, bound, context, this, args.concat(callArgs)); + }); + return bound; + }); + + // Internal helper for collection methods to determine whether a collection + // should be iterated as an array or as an object. + // Related: https://people.mozilla.org/~jorendorff/es6-draft.html#sec-tolength + // Avoids a very nasty iOS 8 JIT bug on ARM-64. #2094 + var isArrayLike = createSizePropertyCheck(getLength); + + // Internal implementation of a recursive `flatten` function. + function flatten(input, depth, strict, output) { + output = output || []; + if (!depth && depth !== 0) { + depth = Infinity; + } else if (depth <= 0) { + return output.concat(input); + } + var idx = output.length; + for (var i = 0, length = getLength(input); i < length; i++) { + var value = input[i]; + if (isArrayLike(value) && (isArray(value) || isArguments$1(value))) { + // Flatten current level of array or arguments object. + if (depth > 1) { + flatten(value, depth - 1, strict, output); + idx = output.length; + } else { + var j = 0, len = value.length; + while (j < len) output[idx++] = value[j++]; + } + } else if (!strict) { + output[idx++] = value; + } + } + return output; + } + + // Bind a number of an object's methods to that object. Remaining arguments + // are the method names to be bound. Useful for ensuring that all callbacks + // defined on an object belong to it. + var bindAll = restArguments(function(obj, keys) { + keys = flatten(keys, false, false); + var index = keys.length; + if (index < 1) throw new Error('bindAll must be passed function names'); + while (index--) { + var key = keys[index]; + obj[key] = bind(obj[key], obj); + } + return obj; + }); + + // Memoize an expensive function by storing its results. + function memoize(func, hasher) { + var memoize = function(key) { + var cache = memoize.cache; + var address = '' + (hasher ? hasher.apply(this, arguments) : key); + if (!has(cache, address)) cache[address] = func.apply(this, arguments); + return cache[address]; + }; + memoize.cache = {}; + return memoize; + } + + // Delays a function for the given number of milliseconds, and then calls + // it with the arguments supplied. + var delay = restArguments(function(func, wait, args) { + return setTimeout(function() { + return func.apply(null, args); + }, wait); + }); + + // Defers a function, scheduling it to run after the current call stack has + // cleared. + var defer = partial(delay, _, 1); + + // Returns a function, that, when invoked, will only be triggered at most once + // during a given window of time. Normally, the throttled function will run + // as much as it can, without ever going more than once per `wait` duration; + // but if you'd like to disable the execution on the leading edge, pass + // `{leading: false}`. To disable execution on the trailing edge, ditto. + function throttle(func, wait, options) { + var timeout, context, args, result; + var previous = 0; + if (!options) options = {}; + + var later = function() { + previous = options.leading === false ? 0 : now(); + timeout = null; + result = func.apply(context, args); + if (!timeout) context = args = null; + }; + + var throttled = function() { + var _now = now(); + if (!previous && options.leading === false) previous = _now; + var remaining = wait - (_now - previous); + context = this; + args = arguments; + if (remaining <= 0 || remaining > wait) { + if (timeout) { + clearTimeout(timeout); + timeout = null; + } + previous = _now; + result = func.apply(context, args); + if (!timeout) context = args = null; + } else if (!timeout && options.trailing !== false) { + timeout = setTimeout(later, remaining); + } + return result; + }; + + throttled.cancel = function() { + clearTimeout(timeout); + previous = 0; + timeout = context = args = null; + }; + + return throttled; + } + + // When a sequence of calls of the returned function ends, the argument + // function is triggered. The end of a sequence is defined by the `wait` + // parameter. If `immediate` is passed, the argument function will be + // triggered at the beginning of the sequence instead of at the end. + function debounce(func, wait, immediate) { + var timeout, previous, args, result, context; + + var later = function() { + var passed = now() - previous; + if (wait > passed) { + timeout = setTimeout(later, wait - passed); + } else { + timeout = null; + if (!immediate) result = func.apply(context, args); + // This check is needed because `func` can recursively invoke `debounced`. + if (!timeout) args = context = null; + } + }; + + var debounced = restArguments(function(_args) { + context = this; + args = _args; + previous = now(); + if (!timeout) { + timeout = setTimeout(later, wait); + if (immediate) result = func.apply(context, args); + } + return result; + }); + + debounced.cancel = function() { + clearTimeout(timeout); + timeout = args = context = null; + }; + + return debounced; + } + + // Returns the first function passed as an argument to the second, + // allowing you to adjust arguments, run code before and after, and + // conditionally execute the original function. + function wrap(func, wrapper) { + return partial(wrapper, func); + } + + // Returns a negated version of the passed-in predicate. + function negate(predicate) { + return function() { + return !predicate.apply(this, arguments); + }; + } + + // Returns a function that is the composition of a list of functions, each + // consuming the return value of the function that follows. + function compose() { + var args = arguments; + var start = args.length - 1; + return function() { + var i = start; + var result = args[start].apply(this, arguments); + while (i--) result = args[i].call(this, result); + return result; + }; + } + + // Returns a function that will only be executed on and after the Nth call. + function after(times, func) { + return function() { + if (--times < 1) { + return func.apply(this, arguments); + } + }; + } + + // Returns a function that will only be executed up to (but not including) the + // Nth call. + function before(times, func) { + var memo; + return function() { + if (--times > 0) { + memo = func.apply(this, arguments); + } + if (times <= 1) func = null; + return memo; + }; + } + + // Returns a function that will be executed at most one time, no matter how + // often you call it. Useful for lazy initialization. + var once = partial(before, 2); + + // Returns the first key on an object that passes a truth test. + function findKey(obj, predicate, context) { + predicate = cb(predicate, context); + var _keys = keys(obj), key; + for (var i = 0, length = _keys.length; i < length; i++) { + key = _keys[i]; + if (predicate(obj[key], key, obj)) return key; + } + } + + // Internal function to generate `_.findIndex` and `_.findLastIndex`. + function createPredicateIndexFinder(dir) { + return function(array, predicate, context) { + predicate = cb(predicate, context); + var length = getLength(array); + var index = dir > 0 ? 0 : length - 1; + for (; index >= 0 && index < length; index += dir) { + if (predicate(array[index], index, array)) return index; + } + return -1; + }; + } + + // Returns the first index on an array-like that passes a truth test. + var findIndex = createPredicateIndexFinder(1); + + // Returns the last index on an array-like that passes a truth test. + var findLastIndex = createPredicateIndexFinder(-1); + + // Use a comparator function to figure out the smallest index at which + // an object should be inserted so as to maintain order. Uses binary search. + function sortedIndex(array, obj, iteratee, context) { + iteratee = cb(iteratee, context, 1); + var value = iteratee(obj); + var low = 0, high = getLength(array); + while (low < high) { + var mid = Math.floor((low + high) / 2); + if (iteratee(array[mid]) < value) low = mid + 1; else high = mid; + } + return low; + } + + // Internal function to generate the `_.indexOf` and `_.lastIndexOf` functions. + function createIndexFinder(dir, predicateFind, sortedIndex) { + return function(array, item, idx) { + var i = 0, length = getLength(array); + if (typeof idx == 'number') { + if (dir > 0) { + i = idx >= 0 ? idx : Math.max(idx + length, i); + } else { + length = idx >= 0 ? Math.min(idx + 1, length) : idx + length + 1; + } + } else if (sortedIndex && idx && length) { + idx = sortedIndex(array, item); + return array[idx] === item ? idx : -1; + } + if (item !== item) { + idx = predicateFind(slice.call(array, i, length), isNaN$1); + return idx >= 0 ? idx + i : -1; + } + for (idx = dir > 0 ? i : length - 1; idx >= 0 && idx < length; idx += dir) { + if (array[idx] === item) return idx; + } + return -1; + }; + } + + // Return the position of the first occurrence of an item in an array, + // or -1 if the item is not included in the array. + // If the array is large and already in sort order, pass `true` + // for **isSorted** to use binary search. + var indexOf = createIndexFinder(1, findIndex, sortedIndex); + + // Return the position of the last occurrence of an item in an array, + // or -1 if the item is not included in the array. + var lastIndexOf = createIndexFinder(-1, findLastIndex); + + // Return the first value which passes a truth test. + function find(obj, predicate, context) { + var keyFinder = isArrayLike(obj) ? findIndex : findKey; + var key = keyFinder(obj, predicate, context); + if (key !== void 0 && key !== -1) return obj[key]; + } + + // Convenience version of a common use case of `_.find`: getting the first + // object containing specific `key:value` pairs. + function findWhere(obj, attrs) { + return find(obj, matcher(attrs)); + } + + // The cornerstone for collection functions, an `each` + // implementation, aka `forEach`. + // Handles raw objects in addition to array-likes. Treats all + // sparse array-likes as if they were dense. + function each(obj, iteratee, context) { + iteratee = optimizeCb(iteratee, context); + var i, length; + if (isArrayLike(obj)) { + for (i = 0, length = obj.length; i < length; i++) { + iteratee(obj[i], i, obj); + } + } else { + var _keys = keys(obj); + for (i = 0, length = _keys.length; i < length; i++) { + iteratee(obj[_keys[i]], _keys[i], obj); + } + } + return obj; + } + + // Return the results of applying the iteratee to each element. + function map(obj, iteratee, context) { + iteratee = cb(iteratee, context); + var _keys = !isArrayLike(obj) && keys(obj), + length = (_keys || obj).length, + results = Array(length); + for (var index = 0; index < length; index++) { + var currentKey = _keys ? _keys[index] : index; + results[index] = iteratee(obj[currentKey], currentKey, obj); + } + return results; + } + + // Internal helper to create a reducing function, iterating left or right. + function createReduce(dir) { + // Wrap code that reassigns argument variables in a separate function than + // the one that accesses `arguments.length` to avoid a perf hit. (#1991) + var reducer = function(obj, iteratee, memo, initial) { + var _keys = !isArrayLike(obj) && keys(obj), + length = (_keys || obj).length, + index = dir > 0 ? 0 : length - 1; + if (!initial) { + memo = obj[_keys ? _keys[index] : index]; + index += dir; + } + for (; index >= 0 && index < length; index += dir) { + var currentKey = _keys ? _keys[index] : index; + memo = iteratee(memo, obj[currentKey], currentKey, obj); + } + return memo; + }; + + return function(obj, iteratee, memo, context) { + var initial = arguments.length >= 3; + return reducer(obj, optimizeCb(iteratee, context, 4), memo, initial); + }; + } + + // **Reduce** builds up a single result from a list of values, aka `inject`, + // or `foldl`. + var reduce = createReduce(1); + + // The right-associative version of reduce, also known as `foldr`. + var reduceRight = createReduce(-1); + + // Return all the elements that pass a truth test. + function filter(obj, predicate, context) { + var results = []; + predicate = cb(predicate, context); + each(obj, function(value, index, list) { + if (predicate(value, index, list)) results.push(value); + }); + return results; + } + + // Return all the elements for which a truth test fails. + function reject(obj, predicate, context) { + return filter(obj, negate(cb(predicate)), context); + } + + // Determine whether all of the elements pass a truth test. + function every(obj, predicate, context) { + predicate = cb(predicate, context); + var _keys = !isArrayLike(obj) && keys(obj), + length = (_keys || obj).length; + for (var index = 0; index < length; index++) { + var currentKey = _keys ? _keys[index] : index; + if (!predicate(obj[currentKey], currentKey, obj)) return false; + } + return true; + } + + // Determine if at least one element in the object passes a truth test. + function some(obj, predicate, context) { + predicate = cb(predicate, context); + var _keys = !isArrayLike(obj) && keys(obj), + length = (_keys || obj).length; + for (var index = 0; index < length; index++) { + var currentKey = _keys ? _keys[index] : index; + if (predicate(obj[currentKey], currentKey, obj)) return true; + } + return false; + } + + // Determine if the array or object contains a given item (using `===`). + function contains(obj, item, fromIndex, guard) { + if (!isArrayLike(obj)) obj = values(obj); + if (typeof fromIndex != 'number' || guard) fromIndex = 0; + return indexOf(obj, item, fromIndex) >= 0; + } + + // Invoke a method (with arguments) on every item in a collection. + var invoke = restArguments(function(obj, path, args) { + var contextPath, func; + if (isFunction$1(path)) { + func = path; + } else { + path = toPath$1(path); + contextPath = path.slice(0, -1); + path = path[path.length - 1]; + } + return map(obj, function(context) { + var method = func; + if (!method) { + if (contextPath && contextPath.length) { + context = deepGet(context, contextPath); + } + if (context == null) return void 0; + method = context[path]; + } + return method == null ? method : method.apply(context, args); + }); + }); + + // Convenience version of a common use case of `_.map`: fetching a property. + function pluck(obj, key) { + return map(obj, property(key)); + } + + // Convenience version of a common use case of `_.filter`: selecting only + // objects containing specific `key:value` pairs. + function where(obj, attrs) { + return filter(obj, matcher(attrs)); + } + + // Return the maximum element (or element-based computation). + function max(obj, iteratee, context) { + var result = -Infinity, lastComputed = -Infinity, + value, computed; + if (iteratee == null || typeof iteratee == 'number' && typeof obj[0] != 'object' && obj != null) { + obj = isArrayLike(obj) ? obj : values(obj); + for (var i = 0, length = obj.length; i < length; i++) { + value = obj[i]; + if (value != null && value > result) { + result = value; + } + } + } else { + iteratee = cb(iteratee, context); + each(obj, function(v, index, list) { + computed = iteratee(v, index, list); + if (computed > lastComputed || computed === -Infinity && result === -Infinity) { + result = v; + lastComputed = computed; + } + }); + } + return result; + } + + // Return the minimum element (or element-based computation). + function min(obj, iteratee, context) { + var result = Infinity, lastComputed = Infinity, + value, computed; + if (iteratee == null || typeof iteratee == 'number' && typeof obj[0] != 'object' && obj != null) { + obj = isArrayLike(obj) ? obj : values(obj); + for (var i = 0, length = obj.length; i < length; i++) { + value = obj[i]; + if (value != null && value < result) { + result = value; + } + } + } else { + iteratee = cb(iteratee, context); + each(obj, function(v, index, list) { + computed = iteratee(v, index, list); + if (computed < lastComputed || computed === Infinity && result === Infinity) { + result = v; + lastComputed = computed; + } + }); + } + return result; + } + + // Sample **n** random values from a collection using the modern version of the + // [Fisher-Yates shuffle](https://en.wikipedia.org/wiki/Fisher–Yates_shuffle). + // If **n** is not specified, returns a single random element. + // The internal `guard` argument allows it to work with `_.map`. + function sample(obj, n, guard) { + if (n == null || guard) { + if (!isArrayLike(obj)) obj = values(obj); + return obj[random(obj.length - 1)]; + } + var sample = isArrayLike(obj) ? clone(obj) : values(obj); + var length = getLength(sample); + n = Math.max(Math.min(n, length), 0); + var last = length - 1; + for (var index = 0; index < n; index++) { + var rand = random(index, last); + var temp = sample[index]; + sample[index] = sample[rand]; + sample[rand] = temp; + } + return sample.slice(0, n); + } + + // Shuffle a collection. + function shuffle(obj) { + return sample(obj, Infinity); + } + + // Sort the object's values by a criterion produced by an iteratee. + function sortBy(obj, iteratee, context) { + var index = 0; + iteratee = cb(iteratee, context); + return pluck(map(obj, function(value, key, list) { + return { + value: value, + index: index++, + criteria: iteratee(value, key, list) + }; + }).sort(function(left, right) { + var a = left.criteria; + var b = right.criteria; + if (a !== b) { + if (a > b || a === void 0) return 1; + if (a < b || b === void 0) return -1; + } + return left.index - right.index; + }), 'value'); + } + + // An internal function used for aggregate "group by" operations. + function group(behavior, partition) { + return function(obj, iteratee, context) { + var result = partition ? [[], []] : {}; + iteratee = cb(iteratee, context); + each(obj, function(value, index) { + var key = iteratee(value, index, obj); + behavior(result, value, key); + }); + return result; + }; + } + + // Groups the object's values by a criterion. Pass either a string attribute + // to group by, or a function that returns the criterion. + var groupBy = group(function(result, value, key) { + if (has(result, key)) result[key].push(value); else result[key] = [value]; + }); + + // Indexes the object's values by a criterion, similar to `_.groupBy`, but for + // when you know that your index values will be unique. + var indexBy = group(function(result, value, key) { + result[key] = value; + }); + + // Counts instances of an object that group by a certain criterion. Pass + // either a string attribute to count by, or a function that returns the + // criterion. + var countBy = group(function(result, value, key) { + if (has(result, key)) result[key]++; else result[key] = 1; + }); + + // Split a collection into two arrays: one whose elements all pass the given + // truth test, and one whose elements all do not pass the truth test. + var partition = group(function(result, value, pass) { + result[pass ? 0 : 1].push(value); + }, true); + + // Safely create a real, live array from anything iterable. + var reStrSymbol = /[^\ud800-\udfff]|[\ud800-\udbff][\udc00-\udfff]|[\ud800-\udfff]/g; + function toArray(obj) { + if (!obj) return []; + if (isArray(obj)) return slice.call(obj); + if (isString(obj)) { + // Keep surrogate pair characters together. + return obj.match(reStrSymbol); + } + if (isArrayLike(obj)) return map(obj, identity); + return values(obj); + } + + // Return the number of elements in a collection. + function size(obj) { + if (obj == null) return 0; + return isArrayLike(obj) ? obj.length : keys(obj).length; + } + + // Internal `_.pick` helper function to determine whether `key` is an enumerable + // property name of `obj`. + function keyInObj(value, key, obj) { + return key in obj; + } + + // Return a copy of the object only containing the allowed properties. + var pick = restArguments(function(obj, keys) { + var result = {}, iteratee = keys[0]; + if (obj == null) return result; + if (isFunction$1(iteratee)) { + if (keys.length > 1) iteratee = optimizeCb(iteratee, keys[1]); + keys = allKeys(obj); + } else { + iteratee = keyInObj; + keys = flatten(keys, false, false); + obj = Object(obj); + } + for (var i = 0, length = keys.length; i < length; i++) { + var key = keys[i]; + var value = obj[key]; + if (iteratee(value, key, obj)) result[key] = value; + } + return result; + }); + + // Return a copy of the object without the disallowed properties. + var omit = restArguments(function(obj, keys) { + var iteratee = keys[0], context; + if (isFunction$1(iteratee)) { + iteratee = negate(iteratee); + if (keys.length > 1) context = keys[1]; + } else { + keys = map(flatten(keys, false, false), String); + iteratee = function(value, key) { + return !contains(keys, key); + }; + } + return pick(obj, iteratee, context); + }); + + // Returns everything but the last entry of the array. Especially useful on + // the arguments object. Passing **n** will return all the values in + // the array, excluding the last N. + function initial(array, n, guard) { + return slice.call(array, 0, Math.max(0, array.length - (n == null || guard ? 1 : n))); + } + + // Get the first element of an array. Passing **n** will return the first N + // values in the array. The **guard** check allows it to work with `_.map`. + function first(array, n, guard) { + if (array == null || array.length < 1) return n == null || guard ? void 0 : []; + if (n == null || guard) return array[0]; + return initial(array, array.length - n); + } + + // Returns everything but the first entry of the `array`. Especially useful on + // the `arguments` object. Passing an **n** will return the rest N values in the + // `array`. + function rest(array, n, guard) { + return slice.call(array, n == null || guard ? 1 : n); + } + + // Get the last element of an array. Passing **n** will return the last N + // values in the array. + function last(array, n, guard) { + if (array == null || array.length < 1) return n == null || guard ? void 0 : []; + if (n == null || guard) return array[array.length - 1]; + return rest(array, Math.max(0, array.length - n)); + } + + // Trim out all falsy values from an array. + function compact(array) { + return filter(array, Boolean); + } + + // Flatten out an array, either recursively (by default), or up to `depth`. + // Passing `true` or `false` as `depth` means `1` or `Infinity`, respectively. + function flatten$1(array, depth) { + return flatten(array, depth, false); + } + + // Take the difference between one array and a number of other arrays. + // Only the elements present in just the first array will remain. + var difference = restArguments(function(array, rest) { + rest = flatten(rest, true, true); + return filter(array, function(value){ + return !contains(rest, value); + }); + }); + + // Return a version of the array that does not contain the specified value(s). + var without = restArguments(function(array, otherArrays) { + return difference(array, otherArrays); + }); + + // Produce a duplicate-free version of the array. If the array has already + // been sorted, you have the option of using a faster algorithm. + // The faster algorithm will not work with an iteratee if the iteratee + // is not a one-to-one function, so providing an iteratee will disable + // the faster algorithm. + function uniq(array, isSorted, iteratee, context) { + if (!isBoolean(isSorted)) { + context = iteratee; + iteratee = isSorted; + isSorted = false; + } + if (iteratee != null) iteratee = cb(iteratee, context); + var result = []; + var seen = []; + for (var i = 0, length = getLength(array); i < length; i++) { + var value = array[i], + computed = iteratee ? iteratee(value, i, array) : value; + if (isSorted && !iteratee) { + if (!i || seen !== computed) result.push(value); + seen = computed; + } else if (iteratee) { + if (!contains(seen, computed)) { + seen.push(computed); + result.push(value); + } + } else if (!contains(result, value)) { + result.push(value); + } + } + return result; + } + + // Produce an array that contains the union: each distinct element from all of + // the passed-in arrays. + var union = restArguments(function(arrays) { + return uniq(flatten(arrays, true, true)); + }); + + // Produce an array that contains every item shared between all the + // passed-in arrays. + function intersection(array) { + var result = []; + var argsLength = arguments.length; + for (var i = 0, length = getLength(array); i < length; i++) { + var item = array[i]; + if (contains(result, item)) continue; + var j; + for (j = 1; j < argsLength; j++) { + if (!contains(arguments[j], item)) break; + } + if (j === argsLength) result.push(item); + } + return result; + } + + // Complement of zip. Unzip accepts an array of arrays and groups + // each array's elements on shared indices. + function unzip(array) { + var length = array && max(array, getLength).length || 0; + var result = Array(length); + + for (var index = 0; index < length; index++) { + result[index] = pluck(array, index); + } + return result; + } + + // Zip together multiple lists into a single array -- elements that share + // an index go together. + var zip = restArguments(unzip); + + // Converts lists into objects. Pass either a single array of `[key, value]` + // pairs, or two parallel arrays of the same length -- one of keys, and one of + // the corresponding values. Passing by pairs is the reverse of `_.pairs`. + function object(list, values) { + var result = {}; + for (var i = 0, length = getLength(list); i < length; i++) { + if (values) { + result[list[i]] = values[i]; + } else { + result[list[i][0]] = list[i][1]; + } + } + return result; + } + + // Generate an integer Array containing an arithmetic progression. A port of + // the native Python `range()` function. See + // [the Python documentation](https://docs.python.org/library/functions.html#range). + function range(start, stop, step) { + if (stop == null) { + stop = start || 0; + start = 0; + } + if (!step) { + step = stop < start ? -1 : 1; + } + + var length = Math.max(Math.ceil((stop - start) / step), 0); + var range = Array(length); + + for (var idx = 0; idx < length; idx++, start += step) { + range[idx] = start; + } + + return range; + } + + // Chunk a single array into multiple arrays, each containing `count` or fewer + // items. + function chunk(array, count) { + if (count == null || count < 1) return []; + var result = []; + var i = 0, length = array.length; + while (i < length) { + result.push(slice.call(array, i, i += count)); + } + return result; + } + + // Helper function to continue chaining intermediate results. + function chainResult(instance, obj) { + return instance._chain ? _(obj).chain() : obj; + } + + // Add your own custom functions to the Underscore object. + function mixin(obj) { + each(functions(obj), function(name) { + var func = _[name] = obj[name]; + _.prototype[name] = function() { + var args = [this._wrapped]; + push.apply(args, arguments); + return chainResult(this, func.apply(_, args)); + }; + }); + return _; + } + + // Add all mutator `Array` functions to the wrapper. + each(['pop', 'push', 'reverse', 'shift', 'sort', 'splice', 'unshift'], function(name) { + var method = ArrayProto[name]; + _.prototype[name] = function() { + var obj = this._wrapped; + if (obj != null) { + method.apply(obj, arguments); + if ((name === 'shift' || name === 'splice') && obj.length === 0) { + delete obj[0]; + } + } + return chainResult(this, obj); + }; + }); + + // Add all accessor `Array` functions to the wrapper. + each(['concat', 'join', 'slice'], function(name) { + var method = ArrayProto[name]; + _.prototype[name] = function() { + var obj = this._wrapped; + if (obj != null) obj = method.apply(obj, arguments); + return chainResult(this, obj); + }; + }); + + // Named Exports + + var allExports = { + __proto__: null, + VERSION: VERSION, + restArguments: restArguments, + isObject: isObject, + isNull: isNull, + isUndefined: isUndefined, + isBoolean: isBoolean, + isElement: isElement, + isString: isString, + isNumber: isNumber, + isDate: isDate, + isRegExp: isRegExp, + isError: isError, + isSymbol: isSymbol, + isArrayBuffer: isArrayBuffer, + isDataView: isDataView$1, + isArray: isArray, + isFunction: isFunction$1, + isArguments: isArguments$1, + isFinite: isFinite$1, + isNaN: isNaN$1, + isTypedArray: isTypedArray$1, + isEmpty: isEmpty, + isMatch: isMatch, + isEqual: isEqual, + isMap: isMap, + isWeakMap: isWeakMap, + isSet: isSet, + isWeakSet: isWeakSet, + keys: keys, + allKeys: allKeys, + values: values, + pairs: pairs, + invert: invert, + functions: functions, + methods: functions, + extend: extend, + extendOwn: extendOwn, + assign: extendOwn, + defaults: defaults, + create: create, + clone: clone, + tap: tap, + get: get, + has: has$1, + mapObject: mapObject, + identity: identity, + constant: constant, + noop: noop, + toPath: toPath, + property: property, + propertyOf: propertyOf, + matcher: matcher, + matches: matcher, + times: times, + random: random, + now: now, + escape: _escape, + unescape: _unescape, + templateSettings: templateSettings, + template: template, + result: result, + uniqueId: uniqueId, + chain: chain, + iteratee: iteratee, + partial: partial, + bind: bind, + bindAll: bindAll, + memoize: memoize, + delay: delay, + defer: defer, + throttle: throttle, + debounce: debounce, + wrap: wrap, + negate: negate, + compose: compose, + after: after, + before: before, + once: once, + findKey: findKey, + findIndex: findIndex, + findLastIndex: findLastIndex, + sortedIndex: sortedIndex, + indexOf: indexOf, + lastIndexOf: lastIndexOf, + find: find, + detect: find, + findWhere: findWhere, + each: each, + forEach: each, + map: map, + collect: map, + reduce: reduce, + foldl: reduce, + inject: reduce, + reduceRight: reduceRight, + foldr: reduceRight, + filter: filter, + select: filter, + reject: reject, + every: every, + all: every, + some: some, + any: some, + contains: contains, + includes: contains, + include: contains, + invoke: invoke, + pluck: pluck, + where: where, + max: max, + min: min, + shuffle: shuffle, + sample: sample, + sortBy: sortBy, + groupBy: groupBy, + indexBy: indexBy, + countBy: countBy, + partition: partition, + toArray: toArray, + size: size, + pick: pick, + omit: omit, + first: first, + head: first, + take: first, + initial: initial, + last: last, + rest: rest, + tail: rest, + drop: rest, + compact: compact, + flatten: flatten$1, + without: without, + uniq: uniq, + unique: uniq, + union: union, + intersection: intersection, + difference: difference, + unzip: unzip, + transpose: unzip, + zip: zip, + object: object, + range: range, + chunk: chunk, + mixin: mixin, + 'default': _ + }; + + // Default Export + + // Add all of the Underscore functions to the wrapper object. + var _$1 = mixin(allExports); + // Legacy Node.js API. + _$1._ = _$1; + + return _$1; + +}))); +//# sourceMappingURL=underscore.js.map diff --git a/docs/_static/underscore-1.3.1.js b/docs/_static/underscore-1.3.1.js deleted file mode 100644 index 208d4cd89..000000000 --- a/docs/_static/underscore-1.3.1.js +++ /dev/null @@ -1,999 +0,0 @@ -// Underscore.js 1.3.1 -// (c) 2009-2012 Jeremy Ashkenas, DocumentCloud Inc. -// Underscore is freely distributable under the MIT license. -// Portions of Underscore are inspired or borrowed from Prototype, -// Oliver Steele's Functional, and John Resig's Micro-Templating. -// For all details and documentation: -// http://documentcloud.github.com/underscore - -(function() { - - // Baseline setup - // -------------- - - // Establish the root object, `window` in the browser, or `global` on the server. - var root = this; - - // Save the previous value of the `_` variable. - var previousUnderscore = root._; - - // Establish the object that gets returned to break out of a loop iteration. - var breaker = {}; - - // Save bytes in the minified (but not gzipped) version: - var ArrayProto = Array.prototype, ObjProto = Object.prototype, FuncProto = Function.prototype; - - // Create quick reference variables for speed access to core prototypes. - var slice = ArrayProto.slice, - unshift = ArrayProto.unshift, - toString = ObjProto.toString, - hasOwnProperty = ObjProto.hasOwnProperty; - - // All **ECMAScript 5** native function implementations that we hope to use - // are declared here. - var - nativeForEach = ArrayProto.forEach, - nativeMap = ArrayProto.map, - nativeReduce = ArrayProto.reduce, - nativeReduceRight = ArrayProto.reduceRight, - nativeFilter = ArrayProto.filter, - nativeEvery = ArrayProto.every, - nativeSome = ArrayProto.some, - nativeIndexOf = ArrayProto.indexOf, - nativeLastIndexOf = ArrayProto.lastIndexOf, - nativeIsArray = Array.isArray, - nativeKeys = Object.keys, - nativeBind = FuncProto.bind; - - // Create a safe reference to the Underscore object for use below. - var _ = function(obj) { return new wrapper(obj); }; - - // Export the Underscore object for **Node.js**, with - // backwards-compatibility for the old `require()` API. If we're in - // the browser, add `_` as a global object via a string identifier, - // for Closure Compiler "advanced" mode. - if (typeof exports !== 'undefined') { - if (typeof module !== 'undefined' && module.exports) { - exports = module.exports = _; - } - exports._ = _; - } else { - root['_'] = _; - } - - // Current version. - _.VERSION = '1.3.1'; - - // Collection Functions - // -------------------- - - // The cornerstone, an `each` implementation, aka `forEach`. - // Handles objects with the built-in `forEach`, arrays, and raw objects. - // Delegates to **ECMAScript 5**'s native `forEach` if available. - var each = _.each = _.forEach = function(obj, iterator, context) { - if (obj == null) return; - if (nativeForEach && obj.forEach === nativeForEach) { - obj.forEach(iterator, context); - } else if (obj.length === +obj.length) { - for (var i = 0, l = obj.length; i < l; i++) { - if (i in obj && iterator.call(context, obj[i], i, obj) === breaker) return; - } - } else { - for (var key in obj) { - if (_.has(obj, key)) { - if (iterator.call(context, obj[key], key, obj) === breaker) return; - } - } - } - }; - - // Return the results of applying the iterator to each element. - // Delegates to **ECMAScript 5**'s native `map` if available. - _.map = _.collect = function(obj, iterator, context) { - var results = []; - if (obj == null) return results; - if (nativeMap && obj.map === nativeMap) return obj.map(iterator, context); - each(obj, function(value, index, list) { - results[results.length] = iterator.call(context, value, index, list); - }); - if (obj.length === +obj.length) results.length = obj.length; - return results; - }; - - // **Reduce** builds up a single result from a list of values, aka `inject`, - // or `foldl`. Delegates to **ECMAScript 5**'s native `reduce` if available. - _.reduce = _.foldl = _.inject = function(obj, iterator, memo, context) { - var initial = arguments.length > 2; - if (obj == null) obj = []; - if (nativeReduce && obj.reduce === nativeReduce) { - if (context) iterator = _.bind(iterator, context); - return initial ? obj.reduce(iterator, memo) : obj.reduce(iterator); - } - each(obj, function(value, index, list) { - if (!initial) { - memo = value; - initial = true; - } else { - memo = iterator.call(context, memo, value, index, list); - } - }); - if (!initial) throw new TypeError('Reduce of empty array with no initial value'); - return memo; - }; - - // The right-associative version of reduce, also known as `foldr`. - // Delegates to **ECMAScript 5**'s native `reduceRight` if available. - _.reduceRight = _.foldr = function(obj, iterator, memo, context) { - var initial = arguments.length > 2; - if (obj == null) obj = []; - if (nativeReduceRight && obj.reduceRight === nativeReduceRight) { - if (context) iterator = _.bind(iterator, context); - return initial ? obj.reduceRight(iterator, memo) : obj.reduceRight(iterator); - } - var reversed = _.toArray(obj).reverse(); - if (context && !initial) iterator = _.bind(iterator, context); - return initial ? _.reduce(reversed, iterator, memo, context) : _.reduce(reversed, iterator); - }; - - // Return the first value which passes a truth test. Aliased as `detect`. - _.find = _.detect = function(obj, iterator, context) { - var result; - any(obj, function(value, index, list) { - if (iterator.call(context, value, index, list)) { - result = value; - return true; - } - }); - return result; - }; - - // Return all the elements that pass a truth test. - // Delegates to **ECMAScript 5**'s native `filter` if available. - // Aliased as `select`. - _.filter = _.select = function(obj, iterator, context) { - var results = []; - if (obj == null) return results; - if (nativeFilter && obj.filter === nativeFilter) return obj.filter(iterator, context); - each(obj, function(value, index, list) { - if (iterator.call(context, value, index, list)) results[results.length] = value; - }); - return results; - }; - - // Return all the elements for which a truth test fails. - _.reject = function(obj, iterator, context) { - var results = []; - if (obj == null) return results; - each(obj, function(value, index, list) { - if (!iterator.call(context, value, index, list)) results[results.length] = value; - }); - return results; - }; - - // Determine whether all of the elements match a truth test. - // Delegates to **ECMAScript 5**'s native `every` if available. - // Aliased as `all`. - _.every = _.all = function(obj, iterator, context) { - var result = true; - if (obj == null) return result; - if (nativeEvery && obj.every === nativeEvery) return obj.every(iterator, context); - each(obj, function(value, index, list) { - if (!(result = result && iterator.call(context, value, index, list))) return breaker; - }); - return result; - }; - - // Determine if at least one element in the object matches a truth test. - // Delegates to **ECMAScript 5**'s native `some` if available. - // Aliased as `any`. - var any = _.some = _.any = function(obj, iterator, context) { - iterator || (iterator = _.identity); - var result = false; - if (obj == null) return result; - if (nativeSome && obj.some === nativeSome) return obj.some(iterator, context); - each(obj, function(value, index, list) { - if (result || (result = iterator.call(context, value, index, list))) return breaker; - }); - return !!result; - }; - - // Determine if a given value is included in the array or object using `===`. - // Aliased as `contains`. - _.include = _.contains = function(obj, target) { - var found = false; - if (obj == null) return found; - if (nativeIndexOf && obj.indexOf === nativeIndexOf) return obj.indexOf(target) != -1; - found = any(obj, function(value) { - return value === target; - }); - return found; - }; - - // Invoke a method (with arguments) on every item in a collection. - _.invoke = function(obj, method) { - var args = slice.call(arguments, 2); - return _.map(obj, function(value) { - return (_.isFunction(method) ? method || value : value[method]).apply(value, args); - }); - }; - - // Convenience version of a common use case of `map`: fetching a property. - _.pluck = function(obj, key) { - return _.map(obj, function(value){ return value[key]; }); - }; - - // Return the maximum element or (element-based computation). - _.max = function(obj, iterator, context) { - if (!iterator && _.isArray(obj)) return Math.max.apply(Math, obj); - if (!iterator && _.isEmpty(obj)) return -Infinity; - var result = {computed : -Infinity}; - each(obj, function(value, index, list) { - var computed = iterator ? iterator.call(context, value, index, list) : value; - computed >= result.computed && (result = {value : value, computed : computed}); - }); - return result.value; - }; - - // Return the minimum element (or element-based computation). - _.min = function(obj, iterator, context) { - if (!iterator && _.isArray(obj)) return Math.min.apply(Math, obj); - if (!iterator && _.isEmpty(obj)) return Infinity; - var result = {computed : Infinity}; - each(obj, function(value, index, list) { - var computed = iterator ? iterator.call(context, value, index, list) : value; - computed < result.computed && (result = {value : value, computed : computed}); - }); - return result.value; - }; - - // Shuffle an array. - _.shuffle = function(obj) { - var shuffled = [], rand; - each(obj, function(value, index, list) { - if (index == 0) { - shuffled[0] = value; - } else { - rand = Math.floor(Math.random() * (index + 1)); - shuffled[index] = shuffled[rand]; - shuffled[rand] = value; - } - }); - return shuffled; - }; - - // Sort the object's values by a criterion produced by an iterator. - _.sortBy = function(obj, iterator, context) { - return _.pluck(_.map(obj, function(value, index, list) { - return { - value : value, - criteria : iterator.call(context, value, index, list) - }; - }).sort(function(left, right) { - var a = left.criteria, b = right.criteria; - return a < b ? -1 : a > b ? 1 : 0; - }), 'value'); - }; - - // Groups the object's values by a criterion. Pass either a string attribute - // to group by, or a function that returns the criterion. - _.groupBy = function(obj, val) { - var result = {}; - var iterator = _.isFunction(val) ? val : function(obj) { return obj[val]; }; - each(obj, function(value, index) { - var key = iterator(value, index); - (result[key] || (result[key] = [])).push(value); - }); - return result; - }; - - // Use a comparator function to figure out at what index an object should - // be inserted so as to maintain order. Uses binary search. - _.sortedIndex = function(array, obj, iterator) { - iterator || (iterator = _.identity); - var low = 0, high = array.length; - while (low < high) { - var mid = (low + high) >> 1; - iterator(array[mid]) < iterator(obj) ? low = mid + 1 : high = mid; - } - return low; - }; - - // Safely convert anything iterable into a real, live array. - _.toArray = function(iterable) { - if (!iterable) return []; - if (iterable.toArray) return iterable.toArray(); - if (_.isArray(iterable)) return slice.call(iterable); - if (_.isArguments(iterable)) return slice.call(iterable); - return _.values(iterable); - }; - - // Return the number of elements in an object. - _.size = function(obj) { - return _.toArray(obj).length; - }; - - // Array Functions - // --------------- - - // Get the first element of an array. Passing **n** will return the first N - // values in the array. Aliased as `head`. The **guard** check allows it to work - // with `_.map`. - _.first = _.head = function(array, n, guard) { - return (n != null) && !guard ? slice.call(array, 0, n) : array[0]; - }; - - // Returns everything but the last entry of the array. Especcialy useful on - // the arguments object. Passing **n** will return all the values in - // the array, excluding the last N. The **guard** check allows it to work with - // `_.map`. - _.initial = function(array, n, guard) { - return slice.call(array, 0, array.length - ((n == null) || guard ? 1 : n)); - }; - - // Get the last element of an array. Passing **n** will return the last N - // values in the array. The **guard** check allows it to work with `_.map`. - _.last = function(array, n, guard) { - if ((n != null) && !guard) { - return slice.call(array, Math.max(array.length - n, 0)); - } else { - return array[array.length - 1]; - } - }; - - // Returns everything but the first entry of the array. Aliased as `tail`. - // Especially useful on the arguments object. Passing an **index** will return - // the rest of the values in the array from that index onward. The **guard** - // check allows it to work with `_.map`. - _.rest = _.tail = function(array, index, guard) { - return slice.call(array, (index == null) || guard ? 1 : index); - }; - - // Trim out all falsy values from an array. - _.compact = function(array) { - return _.filter(array, function(value){ return !!value; }); - }; - - // Return a completely flattened version of an array. - _.flatten = function(array, shallow) { - return _.reduce(array, function(memo, value) { - if (_.isArray(value)) return memo.concat(shallow ? value : _.flatten(value)); - memo[memo.length] = value; - return memo; - }, []); - }; - - // Return a version of the array that does not contain the specified value(s). - _.without = function(array) { - return _.difference(array, slice.call(arguments, 1)); - }; - - // Produce a duplicate-free version of the array. If the array has already - // been sorted, you have the option of using a faster algorithm. - // Aliased as `unique`. - _.uniq = _.unique = function(array, isSorted, iterator) { - var initial = iterator ? _.map(array, iterator) : array; - var result = []; - _.reduce(initial, function(memo, el, i) { - if (0 == i || (isSorted === true ? _.last(memo) != el : !_.include(memo, el))) { - memo[memo.length] = el; - result[result.length] = array[i]; - } - return memo; - }, []); - return result; - }; - - // Produce an array that contains the union: each distinct element from all of - // the passed-in arrays. - _.union = function() { - return _.uniq(_.flatten(arguments, true)); - }; - - // Produce an array that contains every item shared between all the - // passed-in arrays. (Aliased as "intersect" for back-compat.) - _.intersection = _.intersect = function(array) { - var rest = slice.call(arguments, 1); - return _.filter(_.uniq(array), function(item) { - return _.every(rest, function(other) { - return _.indexOf(other, item) >= 0; - }); - }); - }; - - // Take the difference between one array and a number of other arrays. - // Only the elements present in just the first array will remain. - _.difference = function(array) { - var rest = _.flatten(slice.call(arguments, 1)); - return _.filter(array, function(value){ return !_.include(rest, value); }); - }; - - // Zip together multiple lists into a single array -- elements that share - // an index go together. - _.zip = function() { - var args = slice.call(arguments); - var length = _.max(_.pluck(args, 'length')); - var results = new Array(length); - for (var i = 0; i < length; i++) results[i] = _.pluck(args, "" + i); - return results; - }; - - // If the browser doesn't supply us with indexOf (I'm looking at you, **MSIE**), - // we need this function. Return the position of the first occurrence of an - // item in an array, or -1 if the item is not included in the array. - // Delegates to **ECMAScript 5**'s native `indexOf` if available. - // If the array is large and already in sort order, pass `true` - // for **isSorted** to use binary search. - _.indexOf = function(array, item, isSorted) { - if (array == null) return -1; - var i, l; - if (isSorted) { - i = _.sortedIndex(array, item); - return array[i] === item ? i : -1; - } - if (nativeIndexOf && array.indexOf === nativeIndexOf) return array.indexOf(item); - for (i = 0, l = array.length; i < l; i++) if (i in array && array[i] === item) return i; - return -1; - }; - - // Delegates to **ECMAScript 5**'s native `lastIndexOf` if available. - _.lastIndexOf = function(array, item) { - if (array == null) return -1; - if (nativeLastIndexOf && array.lastIndexOf === nativeLastIndexOf) return array.lastIndexOf(item); - var i = array.length; - while (i--) if (i in array && array[i] === item) return i; - return -1; - }; - - // Generate an integer Array containing an arithmetic progression. A port of - // the native Python `range()` function. See - // [the Python documentation](http://docs.python.org/library/functions.html#range). - _.range = function(start, stop, step) { - if (arguments.length <= 1) { - stop = start || 0; - start = 0; - } - step = arguments[2] || 1; - - var len = Math.max(Math.ceil((stop - start) / step), 0); - var idx = 0; - var range = new Array(len); - - while(idx < len) { - range[idx++] = start; - start += step; - } - - return range; - }; - - // Function (ahem) Functions - // ------------------ - - // Reusable constructor function for prototype setting. - var ctor = function(){}; - - // Create a function bound to a given object (assigning `this`, and arguments, - // optionally). Binding with arguments is also known as `curry`. - // Delegates to **ECMAScript 5**'s native `Function.bind` if available. - // We check for `func.bind` first, to fail fast when `func` is undefined. - _.bind = function bind(func, context) { - var bound, args; - if (func.bind === nativeBind && nativeBind) return nativeBind.apply(func, slice.call(arguments, 1)); - if (!_.isFunction(func)) throw new TypeError; - args = slice.call(arguments, 2); - return bound = function() { - if (!(this instanceof bound)) return func.apply(context, args.concat(slice.call(arguments))); - ctor.prototype = func.prototype; - var self = new ctor; - var result = func.apply(self, args.concat(slice.call(arguments))); - if (Object(result) === result) return result; - return self; - }; - }; - - // Bind all of an object's methods to that object. Useful for ensuring that - // all callbacks defined on an object belong to it. - _.bindAll = function(obj) { - var funcs = slice.call(arguments, 1); - if (funcs.length == 0) funcs = _.functions(obj); - each(funcs, function(f) { obj[f] = _.bind(obj[f], obj); }); - return obj; - }; - - // Memoize an expensive function by storing its results. - _.memoize = function(func, hasher) { - var memo = {}; - hasher || (hasher = _.identity); - return function() { - var key = hasher.apply(this, arguments); - return _.has(memo, key) ? memo[key] : (memo[key] = func.apply(this, arguments)); - }; - }; - - // Delays a function for the given number of milliseconds, and then calls - // it with the arguments supplied. - _.delay = function(func, wait) { - var args = slice.call(arguments, 2); - return setTimeout(function(){ return func.apply(func, args); }, wait); - }; - - // Defers a function, scheduling it to run after the current call stack has - // cleared. - _.defer = function(func) { - return _.delay.apply(_, [func, 1].concat(slice.call(arguments, 1))); - }; - - // Returns a function, that, when invoked, will only be triggered at most once - // during a given window of time. - _.throttle = function(func, wait) { - var context, args, timeout, throttling, more; - var whenDone = _.debounce(function(){ more = throttling = false; }, wait); - return function() { - context = this; args = arguments; - var later = function() { - timeout = null; - if (more) func.apply(context, args); - whenDone(); - }; - if (!timeout) timeout = setTimeout(later, wait); - if (throttling) { - more = true; - } else { - func.apply(context, args); - } - whenDone(); - throttling = true; - }; - }; - - // Returns a function, that, as long as it continues to be invoked, will not - // be triggered. The function will be called after it stops being called for - // N milliseconds. - _.debounce = function(func, wait) { - var timeout; - return function() { - var context = this, args = arguments; - var later = function() { - timeout = null; - func.apply(context, args); - }; - clearTimeout(timeout); - timeout = setTimeout(later, wait); - }; - }; - - // Returns a function that will be executed at most one time, no matter how - // often you call it. Useful for lazy initialization. - _.once = function(func) { - var ran = false, memo; - return function() { - if (ran) return memo; - ran = true; - return memo = func.apply(this, arguments); - }; - }; - - // Returns the first function passed as an argument to the second, - // allowing you to adjust arguments, run code before and after, and - // conditionally execute the original function. - _.wrap = function(func, wrapper) { - return function() { - var args = [func].concat(slice.call(arguments, 0)); - return wrapper.apply(this, args); - }; - }; - - // Returns a function that is the composition of a list of functions, each - // consuming the return value of the function that follows. - _.compose = function() { - var funcs = arguments; - return function() { - var args = arguments; - for (var i = funcs.length - 1; i >= 0; i--) { - args = [funcs[i].apply(this, args)]; - } - return args[0]; - }; - }; - - // Returns a function that will only be executed after being called N times. - _.after = function(times, func) { - if (times <= 0) return func(); - return function() { - if (--times < 1) { return func.apply(this, arguments); } - }; - }; - - // Object Functions - // ---------------- - - // Retrieve the names of an object's properties. - // Delegates to **ECMAScript 5**'s native `Object.keys` - _.keys = nativeKeys || function(obj) { - if (obj !== Object(obj)) throw new TypeError('Invalid object'); - var keys = []; - for (var key in obj) if (_.has(obj, key)) keys[keys.length] = key; - return keys; - }; - - // Retrieve the values of an object's properties. - _.values = function(obj) { - return _.map(obj, _.identity); - }; - - // Return a sorted list of the function names available on the object. - // Aliased as `methods` - _.functions = _.methods = function(obj) { - var names = []; - for (var key in obj) { - if (_.isFunction(obj[key])) names.push(key); - } - return names.sort(); - }; - - // Extend a given object with all the properties in passed-in object(s). - _.extend = function(obj) { - each(slice.call(arguments, 1), function(source) { - for (var prop in source) { - obj[prop] = source[prop]; - } - }); - return obj; - }; - - // Fill in a given object with default properties. - _.defaults = function(obj) { - each(slice.call(arguments, 1), function(source) { - for (var prop in source) { - if (obj[prop] == null) obj[prop] = source[prop]; - } - }); - return obj; - }; - - // Create a (shallow-cloned) duplicate of an object. - _.clone = function(obj) { - if (!_.isObject(obj)) return obj; - return _.isArray(obj) ? obj.slice() : _.extend({}, obj); - }; - - // Invokes interceptor with the obj, and then returns obj. - // The primary purpose of this method is to "tap into" a method chain, in - // order to perform operations on intermediate results within the chain. - _.tap = function(obj, interceptor) { - interceptor(obj); - return obj; - }; - - // Internal recursive comparison function. - function eq(a, b, stack) { - // Identical objects are equal. `0 === -0`, but they aren't identical. - // See the Harmony `egal` proposal: http://wiki.ecmascript.org/doku.php?id=harmony:egal. - if (a === b) return a !== 0 || 1 / a == 1 / b; - // A strict comparison is necessary because `null == undefined`. - if (a == null || b == null) return a === b; - // Unwrap any wrapped objects. - if (a._chain) a = a._wrapped; - if (b._chain) b = b._wrapped; - // Invoke a custom `isEqual` method if one is provided. - if (a.isEqual && _.isFunction(a.isEqual)) return a.isEqual(b); - if (b.isEqual && _.isFunction(b.isEqual)) return b.isEqual(a); - // Compare `[[Class]]` names. - var className = toString.call(a); - if (className != toString.call(b)) return false; - switch (className) { - // Strings, numbers, dates, and booleans are compared by value. - case '[object String]': - // Primitives and their corresponding object wrappers are equivalent; thus, `"5"` is - // equivalent to `new String("5")`. - return a == String(b); - case '[object Number]': - // `NaN`s are equivalent, but non-reflexive. An `egal` comparison is performed for - // other numeric values. - return a != +a ? b != +b : (a == 0 ? 1 / a == 1 / b : a == +b); - case '[object Date]': - case '[object Boolean]': - // Coerce dates and booleans to numeric primitive values. Dates are compared by their - // millisecond representations. Note that invalid dates with millisecond representations - // of `NaN` are not equivalent. - return +a == +b; - // RegExps are compared by their source patterns and flags. - case '[object RegExp]': - return a.source == b.source && - a.global == b.global && - a.multiline == b.multiline && - a.ignoreCase == b.ignoreCase; - } - if (typeof a != 'object' || typeof b != 'object') return false; - // Assume equality for cyclic structures. The algorithm for detecting cyclic - // structures is adapted from ES 5.1 section 15.12.3, abstract operation `JO`. - var length = stack.length; - while (length--) { - // Linear search. Performance is inversely proportional to the number of - // unique nested structures. - if (stack[length] == a) return true; - } - // Add the first object to the stack of traversed objects. - stack.push(a); - var size = 0, result = true; - // Recursively compare objects and arrays. - if (className == '[object Array]') { - // Compare array lengths to determine if a deep comparison is necessary. - size = a.length; - result = size == b.length; - if (result) { - // Deep compare the contents, ignoring non-numeric properties. - while (size--) { - // Ensure commutative equality for sparse arrays. - if (!(result = size in a == size in b && eq(a[size], b[size], stack))) break; - } - } - } else { - // Objects with different constructors are not equivalent. - if ('constructor' in a != 'constructor' in b || a.constructor != b.constructor) return false; - // Deep compare objects. - for (var key in a) { - if (_.has(a, key)) { - // Count the expected number of properties. - size++; - // Deep compare each member. - if (!(result = _.has(b, key) && eq(a[key], b[key], stack))) break; - } - } - // Ensure that both objects contain the same number of properties. - if (result) { - for (key in b) { - if (_.has(b, key) && !(size--)) break; - } - result = !size; - } - } - // Remove the first object from the stack of traversed objects. - stack.pop(); - return result; - } - - // Perform a deep comparison to check if two objects are equal. - _.isEqual = function(a, b) { - return eq(a, b, []); - }; - - // Is a given array, string, or object empty? - // An "empty" object has no enumerable own-properties. - _.isEmpty = function(obj) { - if (_.isArray(obj) || _.isString(obj)) return obj.length === 0; - for (var key in obj) if (_.has(obj, key)) return false; - return true; - }; - - // Is a given value a DOM element? - _.isElement = function(obj) { - return !!(obj && obj.nodeType == 1); - }; - - // Is a given value an array? - // Delegates to ECMA5's native Array.isArray - _.isArray = nativeIsArray || function(obj) { - return toString.call(obj) == '[object Array]'; - }; - - // Is a given variable an object? - _.isObject = function(obj) { - return obj === Object(obj); - }; - - // Is a given variable an arguments object? - _.isArguments = function(obj) { - return toString.call(obj) == '[object Arguments]'; - }; - if (!_.isArguments(arguments)) { - _.isArguments = function(obj) { - return !!(obj && _.has(obj, 'callee')); - }; - } - - // Is a given value a function? - _.isFunction = function(obj) { - return toString.call(obj) == '[object Function]'; - }; - - // Is a given value a string? - _.isString = function(obj) { - return toString.call(obj) == '[object String]'; - }; - - // Is a given value a number? - _.isNumber = function(obj) { - return toString.call(obj) == '[object Number]'; - }; - - // Is the given value `NaN`? - _.isNaN = function(obj) { - // `NaN` is the only value for which `===` is not reflexive. - return obj !== obj; - }; - - // Is a given value a boolean? - _.isBoolean = function(obj) { - return obj === true || obj === false || toString.call(obj) == '[object Boolean]'; - }; - - // Is a given value a date? - _.isDate = function(obj) { - return toString.call(obj) == '[object Date]'; - }; - - // Is the given value a regular expression? - _.isRegExp = function(obj) { - return toString.call(obj) == '[object RegExp]'; - }; - - // Is a given value equal to null? - _.isNull = function(obj) { - return obj === null; - }; - - // Is a given variable undefined? - _.isUndefined = function(obj) { - return obj === void 0; - }; - - // Has own property? - _.has = function(obj, key) { - return hasOwnProperty.call(obj, key); - }; - - // Utility Functions - // ----------------- - - // Run Underscore.js in *noConflict* mode, returning the `_` variable to its - // previous owner. Returns a reference to the Underscore object. - _.noConflict = function() { - root._ = previousUnderscore; - return this; - }; - - // Keep the identity function around for default iterators. - _.identity = function(value) { - return value; - }; - - // Run a function **n** times. - _.times = function (n, iterator, context) { - for (var i = 0; i < n; i++) iterator.call(context, i); - }; - - // Escape a string for HTML interpolation. - _.escape = function(string) { - return (''+string).replace(/&/g, '&').replace(//g, '>').replace(/"/g, '"').replace(/'/g, ''').replace(/\//g,'/'); - }; - - // Add your own custom functions to the Underscore object, ensuring that - // they're correctly added to the OOP wrapper as well. - _.mixin = function(obj) { - each(_.functions(obj), function(name){ - addToWrapper(name, _[name] = obj[name]); - }); - }; - - // Generate a unique integer id (unique within the entire client session). - // Useful for temporary DOM ids. - var idCounter = 0; - _.uniqueId = function(prefix) { - var id = idCounter++; - return prefix ? prefix + id : id; - }; - - // By default, Underscore uses ERB-style template delimiters, change the - // following template settings to use alternative delimiters. - _.templateSettings = { - evaluate : /<%([\s\S]+?)%>/g, - interpolate : /<%=([\s\S]+?)%>/g, - escape : /<%-([\s\S]+?)%>/g - }; - - // When customizing `templateSettings`, if you don't want to define an - // interpolation, evaluation or escaping regex, we need one that is - // guaranteed not to match. - var noMatch = /.^/; - - // Within an interpolation, evaluation, or escaping, remove HTML escaping - // that had been previously added. - var unescape = function(code) { - return code.replace(/\\\\/g, '\\').replace(/\\'/g, "'"); - }; - - // JavaScript micro-templating, similar to John Resig's implementation. - // Underscore templating handles arbitrary delimiters, preserves whitespace, - // and correctly escapes quotes within interpolated code. - _.template = function(str, data) { - var c = _.templateSettings; - var tmpl = 'var __p=[],print=function(){__p.push.apply(__p,arguments);};' + - 'with(obj||{}){__p.push(\'' + - str.replace(/\\/g, '\\\\') - .replace(/'/g, "\\'") - .replace(c.escape || noMatch, function(match, code) { - return "',_.escape(" + unescape(code) + "),'"; - }) - .replace(c.interpolate || noMatch, function(match, code) { - return "'," + unescape(code) + ",'"; - }) - .replace(c.evaluate || noMatch, function(match, code) { - return "');" + unescape(code).replace(/[\r\n\t]/g, ' ') + ";__p.push('"; - }) - .replace(/\r/g, '\\r') - .replace(/\n/g, '\\n') - .replace(/\t/g, '\\t') - + "');}return __p.join('');"; - var func = new Function('obj', '_', tmpl); - if (data) return func(data, _); - return function(data) { - return func.call(this, data, _); - }; - }; - - // Add a "chain" function, which will delegate to the wrapper. - _.chain = function(obj) { - return _(obj).chain(); - }; - - // The OOP Wrapper - // --------------- - - // If Underscore is called as a function, it returns a wrapped object that - // can be used OO-style. This wrapper holds altered versions of all the - // underscore functions. Wrapped objects may be chained. - var wrapper = function(obj) { this._wrapped = obj; }; - - // Expose `wrapper.prototype` as `_.prototype` - _.prototype = wrapper.prototype; - - // Helper function to continue chaining intermediate results. - var result = function(obj, chain) { - return chain ? _(obj).chain() : obj; - }; - - // A method to easily add functions to the OOP wrapper. - var addToWrapper = function(name, func) { - wrapper.prototype[name] = function() { - var args = slice.call(arguments); - unshift.call(args, this._wrapped); - return result(func.apply(_, args), this._chain); - }; - }; - - // Add all of the Underscore functions to the wrapper object. - _.mixin(_); - - // Add all mutator Array functions to the wrapper. - each(['pop', 'push', 'reverse', 'shift', 'sort', 'splice', 'unshift'], function(name) { - var method = ArrayProto[name]; - wrapper.prototype[name] = function() { - var wrapped = this._wrapped; - method.apply(wrapped, arguments); - var length = wrapped.length; - if ((name == 'shift' || name == 'splice') && length === 0) delete wrapped[0]; - return result(wrapped, this._chain); - }; - }); - - // Add all accessor Array functions to the wrapper. - each(['concat', 'join', 'slice'], function(name) { - var method = ArrayProto[name]; - wrapper.prototype[name] = function() { - return result(method.apply(this._wrapped, arguments), this._chain); - }; - }); - - // Start chaining a wrapped Underscore object. - wrapper.prototype.chain = function() { - this._chain = true; - return this; - }; - - // Extracts the result from a wrapped and chained object. - wrapper.prototype.value = function() { - return this._wrapped; - }; - -}).call(this); diff --git a/docs/_static/underscore.js b/docs/_static/underscore.js index 5b55f32be..166240ef2 100644 --- a/docs/_static/underscore.js +++ b/docs/_static/underscore.js @@ -1,31 +1,6 @@ -// Underscore.js 1.3.1 -// (c) 2009-2012 Jeremy Ashkenas, DocumentCloud Inc. -// Underscore is freely distributable under the MIT license. -// Portions of Underscore are inspired or borrowed from Prototype, -// Oliver Steele's Functional, and John Resig's Micro-Templating. -// For all details and documentation: -// http://documentcloud.github.com/underscore -(function(){function q(a,c,d){if(a===c)return a!==0||1/a==1/c;if(a==null||c==null)return a===c;if(a._chain)a=a._wrapped;if(c._chain)c=c._wrapped;if(a.isEqual&&b.isFunction(a.isEqual))return a.isEqual(c);if(c.isEqual&&b.isFunction(c.isEqual))return c.isEqual(a);var e=l.call(a);if(e!=l.call(c))return false;switch(e){case "[object String]":return a==String(c);case "[object Number]":return a!=+a?c!=+c:a==0?1/a==1/c:a==+c;case "[object Date]":case "[object Boolean]":return+a==+c;case "[object RegExp]":return a.source== -c.source&&a.global==c.global&&a.multiline==c.multiline&&a.ignoreCase==c.ignoreCase}if(typeof a!="object"||typeof c!="object")return false;for(var f=d.length;f--;)if(d[f]==a)return true;d.push(a);var f=0,g=true;if(e=="[object Array]"){if(f=a.length,g=f==c.length)for(;f--;)if(!(g=f in a==f in c&&q(a[f],c[f],d)))break}else{if("constructor"in a!="constructor"in c||a.constructor!=c.constructor)return false;for(var h in a)if(b.has(a,h)&&(f++,!(g=b.has(c,h)&&q(a[h],c[h],d))))break;if(g){for(h in c)if(b.has(c, -h)&&!f--)break;g=!f}}d.pop();return g}var r=this,G=r._,n={},k=Array.prototype,o=Object.prototype,i=k.slice,H=k.unshift,l=o.toString,I=o.hasOwnProperty,w=k.forEach,x=k.map,y=k.reduce,z=k.reduceRight,A=k.filter,B=k.every,C=k.some,p=k.indexOf,D=k.lastIndexOf,o=Array.isArray,J=Object.keys,s=Function.prototype.bind,b=function(a){return new m(a)};if(typeof exports!=="undefined"){if(typeof module!=="undefined"&&module.exports)exports=module.exports=b;exports._=b}else r._=b;b.VERSION="1.3.1";var j=b.each= -b.forEach=function(a,c,d){if(a!=null)if(w&&a.forEach===w)a.forEach(c,d);else if(a.length===+a.length)for(var e=0,f=a.length;e2;a== -null&&(a=[]);if(y&&a.reduce===y)return e&&(c=b.bind(c,e)),f?a.reduce(c,d):a.reduce(c);j(a,function(a,b,i){f?d=c.call(e,d,a,b,i):(d=a,f=true)});if(!f)throw new TypeError("Reduce of empty array with no initial value");return d};b.reduceRight=b.foldr=function(a,c,d,e){var f=arguments.length>2;a==null&&(a=[]);if(z&&a.reduceRight===z)return e&&(c=b.bind(c,e)),f?a.reduceRight(c,d):a.reduceRight(c);var g=b.toArray(a).reverse();e&&!f&&(c=b.bind(c,e));return f?b.reduce(g,c,d,e):b.reduce(g,c)};b.find=b.detect= -function(a,c,b){var e;E(a,function(a,g,h){if(c.call(b,a,g,h))return e=a,true});return e};b.filter=b.select=function(a,c,b){var e=[];if(a==null)return e;if(A&&a.filter===A)return a.filter(c,b);j(a,function(a,g,h){c.call(b,a,g,h)&&(e[e.length]=a)});return e};b.reject=function(a,c,b){var e=[];if(a==null)return e;j(a,function(a,g,h){c.call(b,a,g,h)||(e[e.length]=a)});return e};b.every=b.all=function(a,c,b){var e=true;if(a==null)return e;if(B&&a.every===B)return a.every(c,b);j(a,function(a,g,h){if(!(e= -e&&c.call(b,a,g,h)))return n});return e};var E=b.some=b.any=function(a,c,d){c||(c=b.identity);var e=false;if(a==null)return e;if(C&&a.some===C)return a.some(c,d);j(a,function(a,b,h){if(e||(e=c.call(d,a,b,h)))return n});return!!e};b.include=b.contains=function(a,c){var b=false;if(a==null)return b;return p&&a.indexOf===p?a.indexOf(c)!=-1:b=E(a,function(a){return a===c})};b.invoke=function(a,c){var d=i.call(arguments,2);return b.map(a,function(a){return(b.isFunction(c)?c||a:a[c]).apply(a,d)})};b.pluck= -function(a,c){return b.map(a,function(a){return a[c]})};b.max=function(a,c,d){if(!c&&b.isArray(a))return Math.max.apply(Math,a);if(!c&&b.isEmpty(a))return-Infinity;var e={computed:-Infinity};j(a,function(a,b,h){b=c?c.call(d,a,b,h):a;b>=e.computed&&(e={value:a,computed:b})});return e.value};b.min=function(a,c,d){if(!c&&b.isArray(a))return Math.min.apply(Math,a);if(!c&&b.isEmpty(a))return Infinity;var e={computed:Infinity};j(a,function(a,b,h){b=c?c.call(d,a,b,h):a;bd?1:0}),"value")};b.groupBy=function(a,c){var d={},e=b.isFunction(c)?c:function(a){return a[c]};j(a,function(a,b){var c=e(a,b);(d[c]||(d[c]=[])).push(a)});return d};b.sortedIndex=function(a, -c,d){d||(d=b.identity);for(var e=0,f=a.length;e>1;d(a[g])=0})})};b.difference=function(a){var c=b.flatten(i.call(arguments,1));return b.filter(a,function(a){return!b.include(c,a)})};b.zip=function(){for(var a=i.call(arguments),c=b.max(b.pluck(a,"length")),d=Array(c),e=0;e=0;d--)b=[a[d].apply(this,b)];return b[0]}}; -b.after=function(a,b){return a<=0?b():function(){if(--a<1)return b.apply(this,arguments)}};b.keys=J||function(a){if(a!==Object(a))throw new TypeError("Invalid object");var c=[],d;for(d in a)b.has(a,d)&&(c[c.length]=d);return c};b.values=function(a){return b.map(a,b.identity)};b.functions=b.methods=function(a){var c=[],d;for(d in a)b.isFunction(a[d])&&c.push(d);return c.sort()};b.extend=function(a){j(i.call(arguments,1),function(b){for(var d in b)a[d]=b[d]});return a};b.defaults=function(a){j(i.call(arguments, -1),function(b){for(var d in b)a[d]==null&&(a[d]=b[d])});return a};b.clone=function(a){return!b.isObject(a)?a:b.isArray(a)?a.slice():b.extend({},a)};b.tap=function(a,b){b(a);return a};b.isEqual=function(a,b){return q(a,b,[])};b.isEmpty=function(a){if(b.isArray(a)||b.isString(a))return a.length===0;for(var c in a)if(b.has(a,c))return false;return true};b.isElement=function(a){return!!(a&&a.nodeType==1)};b.isArray=o||function(a){return l.call(a)=="[object Array]"};b.isObject=function(a){return a===Object(a)}; -b.isArguments=function(a){return l.call(a)=="[object Arguments]"};if(!b.isArguments(arguments))b.isArguments=function(a){return!(!a||!b.has(a,"callee"))};b.isFunction=function(a){return l.call(a)=="[object Function]"};b.isString=function(a){return l.call(a)=="[object String]"};b.isNumber=function(a){return l.call(a)=="[object Number]"};b.isNaN=function(a){return a!==a};b.isBoolean=function(a){return a===true||a===false||l.call(a)=="[object Boolean]"};b.isDate=function(a){return l.call(a)=="[object Date]"}; -b.isRegExp=function(a){return l.call(a)=="[object RegExp]"};b.isNull=function(a){return a===null};b.isUndefined=function(a){return a===void 0};b.has=function(a,b){return I.call(a,b)};b.noConflict=function(){r._=G;return this};b.identity=function(a){return a};b.times=function(a,b,d){for(var e=0;e/g,">").replace(/"/g,""").replace(/'/g,"'").replace(/\//g,"/")};b.mixin=function(a){j(b.functions(a), -function(c){K(c,b[c]=a[c])})};var L=0;b.uniqueId=function(a){var b=L++;return a?a+b:b};b.templateSettings={evaluate:/<%([\s\S]+?)%>/g,interpolate:/<%=([\s\S]+?)%>/g,escape:/<%-([\s\S]+?)%>/g};var t=/.^/,u=function(a){return a.replace(/\\\\/g,"\\").replace(/\\'/g,"'")};b.template=function(a,c){var d=b.templateSettings,d="var __p=[],print=function(){__p.push.apply(__p,arguments);};with(obj||{}){__p.push('"+a.replace(/\\/g,"\\\\").replace(/'/g,"\\'").replace(d.escape||t,function(a,b){return"',_.escape("+ -u(b)+"),'"}).replace(d.interpolate||t,function(a,b){return"',"+u(b)+",'"}).replace(d.evaluate||t,function(a,b){return"');"+u(b).replace(/[\r\n\t]/g," ")+";__p.push('"}).replace(/\r/g,"\\r").replace(/\n/g,"\\n").replace(/\t/g,"\\t")+"');}return __p.join('');",e=new Function("obj","_",d);return c?e(c,b):function(a){return e.call(this,a,b)}};b.chain=function(a){return b(a).chain()};var m=function(a){this._wrapped=a};b.prototype=m.prototype;var v=function(a,c){return c?b(a).chain():a},K=function(a,c){m.prototype[a]= -function(){var a=i.call(arguments);H.call(a,this._wrapped);return v(c.apply(b,a),this._chain)}};b.mixin(b);j("pop,push,reverse,shift,sort,splice,unshift".split(","),function(a){var b=k[a];m.prototype[a]=function(){var d=this._wrapped;b.apply(d,arguments);var e=d.length;(a=="shift"||a=="splice")&&e===0&&delete d[0];return v(d,this._chain)}});j(["concat","join","slice"],function(a){var b=k[a];m.prototype[a]=function(){return v(b.apply(this._wrapped,arguments),this._chain)}});m.prototype.chain=function(){this._chain= -true;return this};m.prototype.value=function(){return this._wrapped}}).call(this); +!function(n,r){"object"==typeof exports&&"undefined"!=typeof module?module.exports=r():"function"==typeof define&&define.amd?define("underscore",r):(n=n||self,function(){var t=n._,e=n._=r();e.noConflict=function(){return n._=t,e}}())}(this,(function(){ +// Underscore.js 1.12.0 +// https://underscorejs.org +// (c) 2009-2020 Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors +// Underscore may be freely distributed under the MIT license. +var n="1.12.0",r="object"==typeof self&&self.self===self&&self||"object"==typeof global&&global.global===global&&global||Function("return this")()||{},t=Array.prototype,e=Object.prototype,u="undefined"!=typeof Symbol?Symbol.prototype:null,o=t.push,i=t.slice,a=e.toString,f=e.hasOwnProperty,c="undefined"!=typeof ArrayBuffer,l="undefined"!=typeof DataView,s=Array.isArray,p=Object.keys,v=Object.create,h=c&&ArrayBuffer.isView,y=isNaN,g=isFinite,d=!{toString:null}.propertyIsEnumerable("toString"),b=["valueOf","isPrototypeOf","toString","propertyIsEnumerable","hasOwnProperty","toLocaleString"],m=Math.pow(2,53)-1;function j(n,r){return r=null==r?n.length-1:+r,function(){for(var t=Math.max(arguments.length-r,0),e=Array(t),u=0;u=0&&t<=m}}function $(n){return function(r){return null==r?void 0:r[n]}}var G=$("byteLength"),H=J(G),Q=/\[object ((I|Ui)nt(8|16|32)|Float(32|64)|Uint8Clamped|Big(I|Ui)nt64)Array\]/;var X=c?function(n){return h?h(n)&&!q(n):H(n)&&Q.test(a.call(n))}:K(!1),Y=$("length");function Z(n,r){r=function(n){for(var r={},t=n.length,e=0;e":">",'"':""","'":"'","`":"`"},Kn=Ln(Cn),Jn=Ln(_n(Cn)),$n=tn.templateSettings={evaluate:/<%([\s\S]+?)%>/g,interpolate:/<%=([\s\S]+?)%>/g,escape:/<%-([\s\S]+?)%>/g},Gn=/(.)^/,Hn={"'":"'","\\":"\\","\r":"r","\n":"n","\u2028":"u2028","\u2029":"u2029"},Qn=/\\|'|\r|\n|\u2028|\u2029/g;function Xn(n){return"\\"+Hn[n]}var Yn=0;function Zn(n,r,t,e,u){if(!(e instanceof r))return n.apply(t,u);var o=Mn(n.prototype),i=n.apply(o,u);return _(i)?i:o}var nr=j((function(n,r){var t=nr.placeholder,e=function(){for(var u=0,o=r.length,i=Array(o),a=0;a1)er(a,r-1,t,e),u=e.length;else for(var f=0,c=a.length;f0&&(t=r.apply(this,arguments)),n<=1&&(r=null),t}}var cr=nr(fr,2);function lr(n,r,t){r=qn(r,t);for(var e,u=nn(n),o=0,i=u.length;o0?0:u-1;o>=0&&o0?a=o>=0?o:Math.max(o+f,a):f=o>=0?Math.min(o+1,f):o+f+1;else if(t&&o&&f)return e[o=t(e,u)]===u?o:-1;if(u!=u)return(o=r(i.call(e,a,f),C))>=0?o+a:-1;for(o=n>0?a:f-1;o>=0&&o0?0:i-1;for(u||(e=r[o?o[a]:a],a+=n);a>=0&&a=3;return r(n,Fn(t,u,4),e,o)}}var wr=_r(1),Ar=_r(-1);function xr(n,r,t){var e=[];return r=qn(r,t),mr(n,(function(n,t,u){r(n,t,u)&&e.push(n)})),e}function Sr(n,r,t){r=qn(r,t);for(var e=!tr(n)&&nn(n),u=(e||n).length,o=0;o=0}var Er=j((function(n,r,t){var e,u;return D(r)?u=r:(r=Nn(r),e=r.slice(0,-1),r=r[r.length-1]),jr(n,(function(n){var o=u;if(!o){if(e&&e.length&&(n=In(n,e)),null==n)return;o=n[r]}return null==o?o:o.apply(n,t)}))}));function Br(n,r){return jr(n,Rn(r))}function Nr(n,r,t){var e,u,o=-1/0,i=-1/0;if(null==r||"number"==typeof r&&"object"!=typeof n[0]&&null!=n)for(var a=0,f=(n=tr(n)?n:jn(n)).length;ao&&(o=e);else r=qn(r,t),mr(n,(function(n,t,e){((u=r(n,t,e))>i||u===-1/0&&o===-1/0)&&(o=n,i=u)}));return o}function Ir(n,r,t){if(null==r||t)return tr(n)||(n=jn(n)),n[Wn(n.length-1)];var e=tr(n)?En(n):jn(n),u=Y(e);r=Math.max(Math.min(r,u),0);for(var o=u-1,i=0;i1&&(e=Fn(e,r[1])),r=an(n)):(e=Pr,r=er(r,!1,!1),n=Object(n));for(var u=0,o=r.length;u1&&(t=r[1])):(r=jr(er(r,!1,!1),String),e=function(n,t){return!Mr(r,t)}),qr(n,e,t)}));function Wr(n,r,t){return i.call(n,0,Math.max(0,n.length-(null==r||t?1:r)))}function zr(n,r,t){return null==n||n.length<1?null==r||t?void 0:[]:null==r||t?n[0]:Wr(n,n.length-r)}function Lr(n,r,t){return i.call(n,null==r||t?1:r)}var Cr=j((function(n,r){return r=er(r,!0,!0),xr(n,(function(n){return!Mr(r,n)}))})),Kr=j((function(n,r){return Cr(n,r)}));function Jr(n,r,t,e){A(r)||(e=t,t=r,r=!1),null!=t&&(t=qn(t,e));for(var u=[],o=[],i=0,a=Y(n);ir?(e&&(clearTimeout(e),e=null),a=c,i=n.apply(u,o),e||(u=o=null)):e||!1===t.trailing||(e=setTimeout(f,l)),i};return c.cancel=function(){clearTimeout(e),a=0,e=u=o=null},c},debounce:function(n,r,t){var e,u,o=function(r,t){e=null,t&&(u=n.apply(r,t))},i=j((function(i){if(e&&clearTimeout(e),t){var a=!e;e=setTimeout(o,r),a&&(u=n.apply(this,i))}else e=or(o,r,this,i);return u}));return i.cancel=function(){clearTimeout(e),e=null},i},wrap:function(n,r){return nr(r,n)},negate:ar,compose:function(){var n=arguments,r=n.length-1;return function(){for(var t=r,e=n[r].apply(this,arguments);t--;)e=n[t].call(this,e);return e}},after:function(n,r){return function(){if(--n<1)return r.apply(this,arguments)}},before:fr,once:cr,findKey:lr,findIndex:pr,findLastIndex:vr,sortedIndex:hr,indexOf:gr,lastIndexOf:dr,find:br,detect:br,findWhere:function(n,r){return br(n,Dn(r))},each:mr,forEach:mr,map:jr,collect:jr,reduce:wr,foldl:wr,inject:wr,reduceRight:Ar,foldr:Ar,filter:xr,select:xr,reject:function(n,r,t){return xr(n,ar(qn(r)),t)},every:Sr,all:Sr,some:Or,any:Or,contains:Mr,includes:Mr,include:Mr,invoke:Er,pluck:Br,where:function(n,r){return xr(n,Dn(r))},max:Nr,min:function(n,r,t){var e,u,o=1/0,i=1/0;if(null==r||"number"==typeof r&&"object"!=typeof n[0]&&null!=n)for(var a=0,f=(n=tr(n)?n:jn(n)).length;ae||void 0===t)return 1;if(t - Architecture — CDH website 2.8.0 documentation + Architecture — CDH website 3.0.0 documentation - @@ -39,7 +38,9 @@

    Architecture

    Database

    -

    Database Schema as rendered in DAVILA

    +

    As of version 2.8.1, database documentation and diagrams are available via dbdocs.

    +
    +

    Older versions of the database schema as rendered by DAVILA.

    Overview

    Database overview @@ -169,7 +170,7 @@

    Quick search

    ©2017, CDH @ Princeton & Trustees of Princeton University. | - Powered by Sphinx 3.3.1 + Powered by Sphinx 3.5.3 & Alabaster 0.7.12 | diff --git a/docs/changelog.html b/docs/changelog.html index 6818c5585..c96292a80 100644 --- a/docs/changelog.html +++ b/docs/changelog.html @@ -5,14 +5,13 @@ - CHANGELOG — CDH website 2.8.0 documentation + CHANGELOG — CDH website 3.0.0 documentation - @@ -36,7 +35,48 @@

    CHANGELOG

    -

    2.8

    +

    3.0

    +
      +

    • As a moderator, I want to create and edit events in wagtail so that I can manage them just like other pages.

      • +

    • As a moderator, I want to create and edit people in wagtail so that I can manage them just like pages.

      • +

    • As an editor, I want to create and edit blog posts in wagtail so that I can take advantage of its editing capabilities.

      • +

    • As an editor, I want upload and manage page attachments in wagtail so that I can associate them with pages.

      • +

    • As an editor, I want existing attachments migrated to wagtail so that I can manage them in the new system.

      • +

    • As a moderator, I want existing content pages migrated from mezzanine to wagtail so that I can manage them in the new system.

      • +

    • As a moderator, I want existing uploaded images migrated to wagtail so that I can manage them in the new system.

      • +

    • As a moderator, I want existing related links migrated to wagtail so that I can manage them in the new system.

      • +

    • As an editor, I want existing blog posts migrated to wagtail so that I can manage them in the new system.

      • +

    • As a moderator, I want existing projects migrated to wagtail so that I can manage them in the new system.

      • +

    • As a moderator, I want existing events migrated to wagtail so that I can manage them in the new system.

      • +

    • As a moderator, I want existing people migrated to wagtail so that I can manage them in the new system.

      • +

    • As a moderator, I want People automatically organized into person list pages so I don’t have to manually manage these pages.

      • +

    • As a moderator, I want Projects automatically organized into list pages so I don’t have to manually manage these pages.

      • +

    • As a moderator, I want Events automatically organized by upcoming events and by semester, so that I don’t have to manually manage these list pages.

      • +

    • As a moderator, I want blog posts automatically listed by latest posts, by month, and by year so that I don’t have to manually manage these pages.

      • +

    • As a search engine, I want a sitemap of all pages on the CDH site so that I can index them for users to search.

      • +

    • As an editor, I want to manage the menus displayed across the site in wagtail so that I can easily update them when needed.

      • +

    • As an admin, I want to see the edit history for a page, including edits before the wagtail migration, so that I can see the history of edits to a page.

      • +

    • chore: add apache rewrite rule to ansible for migrated media

      • +

    • chore: Include DB diagrams in documentation

      • +

    • chore: remove inactive user accounts

      • +

    • chore: clean image EXIF metadata

      • +

    • bugfix: superuser permissions required for editing content due to mezzanine site permissions

      • +

    • bugfix: meta information for project pages is incorrect

      • +

    • bugfix: Some past student profiles are displaying twice

      • +

    • bugfix: slug logic doesn’t ensure uniqueness

      • +

    • bugfix: 500 error when trying to view admin blog post list if not superuser

      • +

    • bugfix: working groups display on main project page

      • +
    +
    +
    +

    2.8.1

    +
      +

    • Switch database backend from MySQL to PostgreSQL

      • +

    • Continuous integration now uses GitHub Actions instead of Travis-CI

      • +
    +
    +
    +

    2.8

    • As an admin, I want to associate project contributors with projects based on the dates they were involved instead of by grant, so that I can accurately reflect project team membership over time.

    • As an admin, I want to create staff projects that aren’t R&D and have them show up on the Staff Projects page so I can highlight new work like Startwords.

      • @@ -48,8 +88,8 @@

      2.8

      chore: rename master -> main

    -
    -

    2.7

    +
    +

    2.7

    • As an admin, I want to add a virtual location to events so that people know they can join remotely.

    • show staff affiliates on affiliates page

      • @@ -59,8 +99,8 @@

      2.7

      chore: remove pa11y-ci

    -
    -

    2.6

    +
    +

    2.6

    • As a Content Editor, I want a visual indicator when I’m viewing a page that is not yet published so that I can distinguish between published and unpublished content.

    • As a Content Editor, I want to add text content to the events page so that I can add context to the list of events.

      • @@ -78,8 +118,8 @@

      2.6

      accessibility: add link titles for event cards

    -
    -

    2.5

    +
    +

    2.5

    -
    -

    2.4.3

    +
    +

    2.4.3

    • bugfix: blogpost RSS feed does not respect draft status

    • Configure admin search fields for projects, grants, and blog posts

    • Display event attendance in admin list view

    -
    -

    2.4.2

    +
    +

    2.4.2

    -
    -

    2.4.1

    +
    +

    2.4.1

    -
    -

    2.4

    +
    +

    2.4

    Accessibility updates and new features to display projects in different groupings with indicators for projects build by CDH and those with live websites, and multiple pages to display current and past people affiliated with CDH.

    @@ -156,12 +196,12 @@

    Chores, fixes, and other items -

    2.3.1

    +
    +

    2.3.1

    Sets a null href attribute on carousel links to prevent reloading the page but keep them accessible to screen readers.

    -
    -

    2.3

    +
    +

    2.3

    • As a Content Editor, I want my rich text editor preview to match the way the content will display on the site so that I don’t have to check the published version myself.

    • As a Content Editor, I should only be able to use supported formatting and tags when I edit site content so that the CDH has a uniform web presence.

      • @@ -170,17 +210,17 @@

      2.3¶<

    Upgrade tinyMCE to v4.7.9.

    -
    -

    2.2.2

    +
    +

    2.2.2

    Downgrade Django to 1.10.x (and latest released version of Mezzanine) to avoid a Django compatibility issue with filebrowser_safe.

    -
    -

    2.2.1

    +
    +

    2.2.1

    Minor Sphinx documentation and README cleanup.

    -
    -

    2.2

    +
    +

    2.2

    • As a user, I want to see past CDH positions on a staff member profile page so I can learn about a person’s history with CDH.

    • As a user I want to view a list of alumni so I can get learn about people who have worked with CDH in the past.

      • @@ -206,8 +246,8 @@

      2.2¶<

    -
    -

    2.1

    +
    +

    2.1

    -
    -

    2.0

    +
    +

    2.0

    CDH web 2.0 is a completely new implementation of the functionality in the previous version, with a restructured database and site templates based on bourbon+neat rather than bootstrap.

    @@ -346,21 +386,23 @@

    Navigation

  • Architecture
  • Code Documentation
  • Change Log
  • Deploy Notes
    • @@ -370,25 +412,27 @@

    Navigation

    Table of Contents

    +
    +
    +

    People

    +

    People app for the CDH webapp. +Provides a profile related to Django User, along with job titles and +position information.

    +
    +

    Models

    +
    +
    +class cdhweb.people.models.OldProfile(id, keywords_string, site, title, slug, _meta_title, description, gen_description, created, updated, status, publish_date, expiry_date, short_url, in_sitemap, user, is_staff, education, bio, phone_number, office_location, job_title, department, institution, pu_status, image, thumb)[source]
    +
    +
    +exception DoesNotExist
    -
    -exception MultipleObjectsReturned
    +
    +exception MultipleObjectsReturned
    +
    +
    +get_absolute_url()[source]
    +

    Raise an error if called on a subclass without +get_absolute_url defined, to ensure all search results +contains a URL.

    +
    +
    -
    -class cdhweb.resources.models.UserResource(*args, **kwargs)[source]
    -

    Through-model for associating users with resource types and -corresponding URLs for the specified resource type.

    +
    +class cdhweb.people.models.PeopleLandingPage(*args, **kwargs)[source]
    +

    LandingPage subtype for People that holds Profiles.

    -
    -exception DoesNotExist
    +
    +exception DoesNotExist
    -
    -exception MultipleObjectsReturned
    +
    +exception MultipleObjectsReturned
    -
    -
    -
    -

    People

    -

    People app for the CDH webapp. -Provides a profile related to Django User, along with job titles and -position information.

    -
    -

    Models

    -
    +
    -class cdhweb.people.models.Person(id, password, last_login, is_superuser, username, first_name, last_name, email, is_staff, is_active, date_joined)[source]
    +class cdhweb.people.models.Person(id, first_name, last_name, email, user, cdh_staff, job_title, department, institution, phone_number, office_location, pu_status, image, updated_at)[source]
    -exception DoesNotExist
    +exception DoesNotExist
    -exception MultipleObjectsReturned
    +exception MultipleObjectsReturned
    -
    -cdh_staff()[source]
    -

    is CDH staff

    +
    +cleanup_profile(**kwargs)[source]
    +

    Handler to delete the corresponding Profile on Person deletion.

    -
    -get_absolute_url()[source]
    -

    ‘Display url for user profile

    +
    +property current_title
    +

    Return the first of any non-expired titles held by this Person.

    -property latest_grant
    +property latest_grant

    most recent grants where this person has director role

    -
    -property profile_url
    -

    local profile url, user has a profile, or website url if there is one

    -
    - -
    -
    -published()[source]
    -

    person has a published profile page

    +
    +property most_recent_title
    +

    Return the most recent of any titles held by this Person.

    -
    -property website_url
    -

    personal website url, if set

    -
    - -
    - -
    -
    -class cdhweb.people.models.Position(*args, **kwargs)[source]
    -

    Through model for many-to-many relation between people -and titles. Adds start and end dates to the join table.

    -
    -
    -exception DoesNotExist
    -
    - -
    -
    -exception MultipleObjectsReturned
    -
    - +
    +property profile_url
    +

    Provide the link to published profile on this site if there is one; +otherwise look for an associated website url

    -
    -
    -class cdhweb.people.models.Profile(id, keywords_string, site, title, slug, _meta_title, description, gen_description, created, updated, status, publish_date, expiry_date, short_url, in_sitemap, user, is_staff, education, bio, phone_number, office_location, job_title, department, institution, pu_status, image, thumb)[source]
    -
    -
    -exception DoesNotExist
    -
    - -
    -
    -exception MultipleObjectsReturned
    -
    - -
    -
    -get_absolute_url()[source]
    -

    Raise an error if called on a subclass without -get_absolute_url defined, to ensure all search results -contains a URL.

    +
    +
    +updated_at
    +

    update timestamp

    -
    -class cdhweb.people.models.ProfileQuerySet(model=None, query=None, using=None, hints=None)[source]
    +
    +class cdhweb.people.models.PersonQuerySet(model=None, query=None, using=None, hints=None)[source]
    -
    -affiliates()[source]
    +
    +affiliates()[source]

    Faculty and staff affiliates based on PU status and Project Director project role. Excludes CDH staff.

    -
    -current()[source]
    -

    Return profiles for users with a current position or current grant -based on start and end dates.

    +
    +cdh_staff()[source]
    +

    Return only CDH staff members

    +
    + +
    +
    +current()[source]
    +

    Return people with a current position or current grant based on +start and end dates.

    -
    -current_grant()[source]
    +
    +current_grant()[source]

    Return profiles for users with a current grant.

    -
    -current_position()[source]
    +
    +current_position()[source]

    Return profiles for users with a current position.

    -
    -current_position_nonexec()[source]
    +
    +current_position_nonexec()[source]

    Return profiles for users with a current position, excluding executive committee positions.

    -
    -director_roles = ['Project Director', 'Co-PI: Research Lead']
    +
    +director_roles = ['Project Director', 'Co-PI: Research Lead']

    position titles that indicate a person is a project director

    -
    -exec_member()[source]
    +
    +exec_member()[source]

    Executive committee members

    -
    -exec_member_title = 'Executive Committee Member'
    +
    +exec_member_title = 'Executive Committee Member'

    executive committee member titles

    -
    -executive_committee()[source]
    +
    +executive_committee()[source]

    Executive committee members; based on position title.

    -
    -grant_years()[source]
    +
    +grant_years()[source]

    Annotate with first start and last end grant year for grants that a person was project director.

    -
    -has_upcoming_events()[source]
    -

    Filter profiles to only those with an upcoming published event.

    -
    - -
    -
    -not_students()[source]
    +
    +not_students()[source]

    Filter out students based on PU status

    -
    -order_by_event()[source]
    -

    Order by earliest published event associated with profile.

    -
    - -
    -
    -order_by_position()[source]
    +
    +order_by_position()[source]

    order by job title sort order and then by start date

    -
    -postdoc_titles = ['Postdoctoral Fellow', 'Postdoctoral Fellow and Communications Lead']
    +
    +postdoc_titles = ['Postdoctoral Fellow', 'Postdoctoral Fellow and Communications Lead']

    position titles that indicate a person is a postdoc

    -
    -project_manager_years()[source]
    +
    +project_manager_years()[source]

    Annotate with first start and last end grant year for grants that a person was project manager.

    -
    -project_roles = ['Project Director', 'Project Manager', 'Co-PI: Research Lead']
    -

    memebership roles that indicate someone is an affiliate

    +
    +project_roles = ['Project Director', 'Project Manager', 'Co-PI: Research Lead']
    +

    membership roles that indicate someone is an affiliate

    -
    -sits_with_exec()[source]
    +
    +sits_with_exec()[source]

    Non-faculty Executive committee members

    -
    -speakers()[source]
    -

    Return external speakers at CDH events.

    -
    - -
    -
    -staff()[source]
    -

    Return only CDH staff members

    -
    - -
    -
    -student_affiliates()[source]
    +
    +student_affiliates()[source]

    Return CDH student staff members, grantees, and PGRAs based on Project Director or Project Manager role.

    -
    -student_pu_status = ['graduate', 'undergraduate']
    +
    +student_pu_status = ['graduate', 'undergraduate']

    student status codes from LDAP

    -
    -student_titles = ['Graduate Fellow', 'Graduate Assistant', 'Undergraduate Assistant', 'Postgraduate Research Associate']
    +
    +student_titles = ['Graduate Fellow', 'Graduate Assistant', 'Undergraduate Assistant', 'Postgraduate Research Associate']

    position titles that indicate a staff person is a student

    +
    + +

    Through-model for associating people with resource types and +corresponding URLs for the specified resource type.

    +
    +
    +exception DoesNotExist
    +
    + +
    +
    +exception MultipleObjectsReturned
    +
    + +
    + +
    +
    +class cdhweb.people.models.Position(*args, **kwargs)[source]
    +

    Through model for many-to-many relation between people +and titles. Adds start and end dates to the join table.

    +
    +
    +exception DoesNotExist
    +
    + +
    +
    +exception MultipleObjectsReturned
    +
    + +
    + +
    +
    +class cdhweb.people.models.Profile(*args, **kwargs)[source]
    +

    Profile page for a Person, managed via wagtail.

    +
    +
    +exception DoesNotExist
    +
    + +
    +
    +exception MultipleObjectsReturned
    +
    + +
    +
    +clean()[source]
    +

    Validate that a Person was specified for this profile.

    +
    + +
    +
    +get_context(request)[source]
    +

    Add recent BlogPosts by this Person to their Profile.

    +
    + +
    +
    -class cdhweb.people.models.Title(*args, **kwargs)[source]
    +class cdhweb.people.models.Title(*args, **kwargs)[source]

    Job titles for people

    -exception DoesNotExist
    +exception DoesNotExist
    -exception MultipleObjectsReturned
    +exception MultipleObjectsReturned
    -num_people()[source]
    +num_people()[source]

    Number of people with this position title

    -
    -cdhweb.people.models.init_profile_from_ldap(user, ldapinfo)[source]
    -

    Extra user/profile init logic for auto-populating people -profile fields with data available in LDAP.

    +
    +cdhweb.people.models.init_person_from_ldap(user, ldapinfo)[source]
    +

    Extra User init logic for creating and auto-populating a corresponding +Person with data from LDAP.

    @@ -448,231 +457,128 @@

    Models

    Views

    -class cdhweb.people.views.AffiliateListView(**kwargs)[source]
    +class cdhweb.people.views.AffiliateListView(**kwargs)[source]

    Display current and past faculty & staff affiliates

    -
    -get_current_profiles()[source]
    -

    Get current profiles from the queryset. Override to customize +

    +get_current()[source]
    +

    Get current people from the queryset. Override to customize which filter is used. By default, uses generic current logic that checks both positions and grants.

    -get_queryset()[source]
    +get_queryset()[source]

    Return the list of items for this view.

    The return value must be an iterable and may be an instance of QuerySet in which case QuerySet specific behavior will be enabled.

    -
    -
    -show_cdh_position = False
    -

    do not show person positions; want grant information instead

    -
    -
    -class cdhweb.people.views.ExecListView(**kwargs)[source]
    +class cdhweb.people.views.ExecListView(**kwargs)[source]

    Display current and past executive committee members.

    -get_context_data()[source]
    +get_context_data()[source]

    Get the context for this view.

    -
    -get_current_profiles()[source]
    -

    Get current profiles from the queryset. Override to customize +

    +get_current()[source]
    +

    Get current people from the queryset. Override to customize which filter is used. By default, uses generic current logic that checks both positions and grants.

    -get_queryset()[source]
    +get_queryset()[source]

    Return the list of items for this view.

    The return value must be an iterable and may be an instance of QuerySet in which case QuerySet specific behavior will be enabled.

    -
    -
    -show_cdh_position = False
    -

    do not CDH positions or grants; show job title

    -
    -
    -
    -class cdhweb.people.views.ProfileDetailView(**kwargs)[source]
    -
    -
    -get_context_data(*args, **kwargs)[source]
    -

    Insert the single object into the context dict.

    -
    - -
    -
    -get_queryset()[source]
    -

    Return the QuerySet that will be used to look up the object.

    -

    This method is called by the default implementation of get_object() and -may not be called if get_object() is overridden.

    -
    - -
    - -
    -
    -class cdhweb.people.views.ProfileListView(**kwargs)[source]
    -

    Base class for profile list views

    +
    +class cdhweb.people.views.PersonListView(**kwargs)[source]
    +

    Base class for person list views

    -
    -current_title = ''
    +
    +current_title = ''

    title for non-past people in this category of people

    -
    -get_context_data()[source]
    +
    +get_context_data()[source]

    Get the context for this view.

    -
    -get_current_profiles()[source]
    -

    Get current profiles from the queryset. Override to customize +

    +get_current()[source]
    +

    Get current people from the queryset. Override to customize which filter is used. By default, uses generic current logic that checks both positions and grants.

    -
    -get_past_profiles()[source]
    -

    Get past profiles. Override to customize filters and ordering. By +

    +get_past()[source]
    +

    Get past people. Override to customize filters and ordering. By default, assumes any profiles that aren’t current are past.

    -
    -get_queryset()[source]
    +
    +get_queryset()[source]

    Return the list of items for this view.

    The return value must be an iterable and may be an instance of QuerySet in which case QuerySet specific behavior will be enabled.

    -
    -page_title = ''
    -

    title for this category of people

    -
    - -
    -
    -past_title = ''
    -

    label for past people in this category of people

    -
    - -
    -
    -show_affiliation = False
    -

    show departmental or instutional affiliation (false by default)

    -
    - -
    -
    -show_cdh_position = True
    -

    show CDH position on profile card (true by default)

    +
    +model
    +

    alias of cdhweb.people.models.Person

    -
    -show_events = False
    -

    show related events (i.e. for speakers)

    -
    - -
    -
    -show_grant = True
    -

    show grant recepient information on profle card (true by default)

    -
    - -
    -
    -show_job_title = False
    -

    show official job title (false by default)

    -
    - -
    - -
    -
    -class cdhweb.people.views.ProfileMixinView[source]
    -

    Profile view mixin that sets model to Profile and returns a -published Profile queryset.

    -
    -
    -model
    -

    alias of cdhweb.people.models.Profile

    -
    - -
    - -
    -
    -class cdhweb.people.views.SpeakerListView(**kwargs)[source]
    -

    Display upcoming and past speakers.

    -
    -
    -get_current_profiles()[source]
    -

    Get current profiles from the queryset. Override to customize -which filter is used. By default, uses generic current logic that -checks both positions and grants.

    -
    - -
    -
    -get_past_profiles()[source]
    -

    Get past profiles. Override to customize filters and ordering. By -default, assumes any profiles that aren’t current are past.

    -
    - -
    -
    -get_queryset()[source]
    -

    Return the list of items for this view.

    -

    The return value must be an iterable and may be an instance of -QuerySet in which case QuerySet specific behavior will be enabled.

    +
    +page_title = ''
    +

    title for this category of people

    -
    -show_affiliation = True
    -

    show affiliation and info about events

    +
    +past_title = ''
    +

    label for past people in this category of people

    -class cdhweb.people.views.StaffListView(**kwargs)[source]
    +class cdhweb.people.views.StaffListView(**kwargs)[source]

    Display current and past CDH staff

    -
    -get_current_profiles()[source]
    -

    Get current profiles from the queryset. Override to customize +

    +get_current()[source]
    +

    Get current people from the queryset. Override to customize which filter is used. By default, uses generic current logic that checks both positions and grants.

    -get_queryset()[source]
    +get_queryset()[source]

    Return the list of items for this view.

    The return value must be an iterable and may be an instance of QuerySet in which case QuerySet specific behavior will be enabled.

    @@ -682,19 +588,19 @@

    Models
    -class cdhweb.people.views.StudentListView(**kwargs)[source]
    +class cdhweb.people.views.StudentListView(**kwargs)[source]

    Display current and past graduate fellows, graduate and undergraduate assistants.

    -
    -get_past_profiles()[source]
    -

    Get past profiles. Override to customize filters and ordering. By +

    +get_past()[source]
    +

    Get past people. Override to customize filters and ordering. By default, assumes any profiles that aren’t current are past.

    -get_queryset()[source]
    +get_queryset()[source]

    Return the list of items for this view.

    The return value must be an iterable and may be an instance of QuerySet in which case QuerySet specific behavior will be enabled.

    @@ -712,189 +618,260 @@

    Models

    Models

    -class cdhweb.projects.models.Grant(*args, **kwargs)[source]
    +class cdhweb.projects.models.Grant(*args, **kwargs)[source]

    A specific grant associated with a project

    -exception DoesNotExist
    +exception DoesNotExist
    -exception MultipleObjectsReturned
    +exception MultipleObjectsReturned
    -class cdhweb.projects.models.GrantType(*args, **kwargs)[source]
    +class cdhweb.projects.models.GrantType(*args, **kwargs)[source]

    Model to track kinds of grants

    -exception DoesNotExist
    +exception DoesNotExist
    -exception MultipleObjectsReturned
    +exception MultipleObjectsReturned
    -class cdhweb.projects.models.Membership(*args, **kwargs)[source]
    -

    Project membership - joins project, grant, user, and role.

    +class cdhweb.projects.models.Membership(*args, **kwargs)[source] +

    Project membership - joins project, user, and role.

    -exception DoesNotExist
    +exception DoesNotExist
    -exception MultipleObjectsReturned
    +exception MultipleObjectsReturned
    -
    -class cdhweb.projects.models.Project(*args, **kwargs)[source]
    +
    +class cdhweb.projects.models.OldProject(*args, **kwargs)[source]

    A CDH sponsored project

    +
    +exception DoesNotExist
    +
    + +
    +
    +exception MultipleObjectsReturned
    +
    + +
    +
    +alums()[source]
    +

    PersonQueryset of past members sorted by last name

    +
    + +
    +
    +current_memberships()[source]
    +

    MembershipQueryset of current members sorted by role

    +
    + +
    +
    +get_absolute_url()[source]
    +

    Raise an error if called on a subclass without +get_absolute_url defined, to ensure all search results +contains a URL.

    +
    + +
    +
    +latest_grant()[source]
    +

    Most recent Grant

    +
    + +
    +
    +property website_url
    +

    website url, if set

    +
    + +
    + +
    +
    +class cdhweb.projects.models.Project(*args, **kwargs)[source]
    +

    Page type for a CDH sponsored project or working group.

    +
    -exception DoesNotExist
    +exception DoesNotExist
    -exception MultipleObjectsReturned
    +exception MultipleObjectsReturned
    -alums()[source]
    +alums()[source]

    PersonQueryset of past members sorted by last name

    -current_memberships()[source]
    +current_memberships()[source]

    MembershipQueryset of current members sorted by role

    -
    -get_absolute_url()[source]
    -

    Raise an error if called on a subclass without -get_absolute_url defined, to ensure all search results -contains a URL.

    +
    +get_sitemap_urls(request)[source]
    +

    Override sitemap to prioritize projects built by CDH with a website.

    -latest_grant()[source]
    -

    Most recent Grant

    +latest_grant()[source] +

    Most recent Grant for this Project

    -property website_url
    -

    website url, if set

    +property website_url +

    URL for this Project’s website, if set

    -class cdhweb.projects.models.ProjectQuerySet(model=None, query=None, using=None, hints=None)[source]
    +class cdhweb.projects.models.ProjectQuerySet(model=None, query=None, using=None, hints=None)[source]
    -current()[source]
    +current()[source]

    Projects with a current grant, based on dates

    -highlighted()[source]
    +highlighted()[source]

    return projects that are marked as highlighted

    -not_current()[source]
    +not_current()[source]

    Projects with no current grant, based on dates

    -not_staff_or_postdoc()[source]
    +not_staff_or_postdoc()[source]

    Exclude staff and postdoc projects, based on grant type

    -order_by_newest_grant()[source]
    +order_by_newest_grant()[source]

    order by grant start date, most recent grants first; secondary sort by project title

    -staff_or_postdoc()[source]
    +staff_or_postdoc()[source]

    Staff and postdoc projects, based on grant type

    -staff_postdoc_grants = ['Staff R&D', 'Staff Project', 'Postdoctoral Research Project']
    +staff_postdoc_grants = ['Staff R&D', 'Staff Project', 'Postdoctoral Research Project']

    grant types that indicate staff or postdoc project

    -working_groups()[source]
    +working_groups()[source]

    Include only projects with the working group flag set

    -
    -class cdhweb.projects.models.ProjectResource(*args, **kwargs)[source]
    -

    Through-model for associating projects with resource types and -URLs

    +
    +

    Through-model for associating projects with relatedlinks

    -
    -exception DoesNotExist
    +
    +exception DoesNotExist
    -
    -exception MultipleObjectsReturned
    +
    +exception MultipleObjectsReturned
    +
    + +
    + +
    +
    +class cdhweb.projects.models.ProjectTag(*args, **kwargs)[source]
    +

    Tags for Project pages.

    +
    +
    +exception DoesNotExist
    +
    + +
    +
    +exception MultipleObjectsReturned
    -
    -
    -display_url()[source]
    -

    url cleaned up for display, with leading http(s):// removed

    +
    +
    +class cdhweb.projects.models.ProjectsLandingPage(*args, **kwargs)[source]
    +

    Container page that defines where Project pages can be created.

    +
    +
    +exception DoesNotExist
    +
    + +
    +
    +exception MultipleObjectsReturned
    +
    +
    -class cdhweb.projects.models.Role(*args, **kwargs)[source]
    +class cdhweb.projects.models.Role(*args, **kwargs)[source]

    A role on a project

    -exception DoesNotExist
    +exception DoesNotExist
    -exception MultipleObjectsReturned
    +exception MultipleObjectsReturned
    @@ -903,85 +880,93 @@

    Models

    Views

    -
    -class cdhweb.projects.views.ProjectDetailView(**kwargs)[source]
    -
    -
    -get_context_data(*args, **kwargs)[source]
    -

    Insert the single object into the context dict.

    -
    - +
    +class cdhweb.projects.views.ProjectListView(**kwargs)[source]
    +

    Base class for project list views.

    +
    +
    +get_context_data(*args, **kwargs)[source]
    +

    Add projects, titles, and navigation to context.

    -
    -
    -class cdhweb.projects.views.ProjectListMixinView(**kwargs)[source]
    -
    -
    -get_context_data(*args, **kwargs)[source]
    -

    Get the context for this view.

    +
    +
    +get_current()[source]
    +

    Get current projects from the queryset. Override to customize which +filter is used.

    +
    +
    +get_past()[source]
    +

    Get past projects from the queryset. Override to customize which +filter is used.

    -
    -
    -class cdhweb.projects.views.ProjectListView(**kwargs)[source]
    -

    Current and past projects, based on grant dates. (Does not include -staff and postdoc projects.)

    -get_queryset()[source]
    -

    Return the list of items for this view.

    -

    The return value must be an iterable and may be an instance of -QuerySet in which case QuerySet specific behavior will be enabled.

    +get_queryset()[source] +

    Get all published projects ordered by newest grant.

    +
    + +
    +
    +model
    +

    alias of cdhweb.projects.models.Project

    +
    +
    +page_title = 'Projects'
    +

    title for this category of projects

    -
    -
    -class cdhweb.projects.views.ProjectMixinView[source]
    -

    View mixin that sets model to Project and returns a -published Project queryset.

    -
    -model
    -

    alias of cdhweb.projects.models.Project

    +
    +past_title = 'Past Projects'
    +

    title for past projects in this category of projects

    +
    + +
    + +
    +
    +class cdhweb.projects.views.SponsoredProjectListView(**kwargs)[source]
    +

    Main project list, i.e. not staff/postdoc/working group.

    +
    +
    +get_queryset()[source]
    +

    Get all published sponsored projects.

    -class cdhweb.projects.views.StaffProjectListView(**kwargs)[source]
    -

    Staff projects, based on special staff R&D grant

    +class cdhweb.projects.views.StaffProjectListView(**kwargs)[source] +

    Staff and postdoc projects, based on grant type.

    -get_queryset()[source]
    -

    Return the list of items for this view.

    -

    The return value must be an iterable and may be an instance of -QuerySet in which case QuerySet specific behavior will be enabled.

    +get_queryset()[source] +

    Get all published staff/postdoc projects.

    -class cdhweb.projects.views.WorkingGroupListView(**kwargs)[source]
    -

    Working groups, based on working group project flag

    +class cdhweb.projects.views.WorkingGroupListView(**kwargs)[source] +

    DH Working group list, based on working group project flag.

    -get_context_data(*args, **kwargs)[source]
    -

    Get the context for this view.

    +get_context_data(*args, **kwargs)[source] +

    Override so that working groups are never shown as past.

    -get_queryset()[source]
    -

    Return the list of items for this view.

    -

    The return value must be an iterable and may be an instance of -QuerySet in which case QuerySet specific behavior will be enabled.

    +get_queryset()[source] +

    Get all published DH working groups.

    @@ -996,114 +981,152 @@

    Views

    Models

    -class cdhweb.events.models.Event(*args, **kwargs)[source]
    -

    An event, such as a workshop, lecture, or conference.

    +class cdhweb.events.models.Event(*args, **kwargs)[source] +

    Page type for an event, such as a workshop, lecture, or conference.

    -exception DoesNotExist
    +exception DoesNotExist
    -exception MultipleObjectsReturned
    +exception MultipleObjectsReturned
    -
    -duration()[source]
    -

    duration between start and end time as datetime.timedelta

    +
    +clean()[source]
    +

    Validate that a type was specified for this event.

    -
    -full_url()[source]
    -

    Absolute url, including site address

    +
    +duration()[source]
    +

    duration between start and end time as datetime.timedelta

    -
    -get_absolute_url()[source]
    -

    event detail url on this site

    +
    +get_ical_url()[source]
    +

    URL to download this event as a .ics (iCal) file.

    -
    -get_ical_url()[source]
    -

    URL to download this event as ical

    +
    +get_url_parts(*args, **kwargs)[source]
    +

    Custom event page URLs of the form /events/2014/03/my-event.

    -ical_event()[source]
    +ical_event()[source]

    Return the current event as a icalendar.Event for inclusion in a icalendar.Calendar

    -is_virtual()[source]
    +is_virtual()[source]

    If an event takes place in a virtual location, it is virtual

    +
    +
    +property speaker_list
    +

    Comma-separated list of speaker names.

    +
    +
    -when()[source]
    -

    Event start/end date and time, formatted for display. -Removes leading zeros from hours and converts am/pm to lower case.

    +when()[source] +

    Event start/end date and time, formatted for display.

    +

    Removes leading zeros from hours and converts am/pm to lower case.

    -class cdhweb.events.models.EventQuerySet(model=None, query=None, using=None, hints=None)[source]
    +class cdhweb.events.models.EventQuerySet(model=None, query=None, using=None, hints=None)[source]
    -recent()[source]
    +recent()[source]

    Find past events, most recent first. Only includes events with end date in the past.

    -upcoming()[source]
    +upcoming()[source]

    Find upcoming events. Includes events that end on the current day even if the start time is past.

    +
    +
    +class cdhweb.events.models.EventTag(*args, **kwargs)[source]
    +

    Tags for Event pages.

    +
    +
    +exception DoesNotExist
    +
    + +
    +
    +exception MultipleObjectsReturned
    +
    + +
    +
    -class cdhweb.events.models.EventType(id, name)[source]
    +class cdhweb.events.models.EventType(id, name)[source]
    -exception DoesNotExist
    +exception DoesNotExist
    -exception MultipleObjectsReturned
    +exception MultipleObjectsReturned +
    + +
    + +
    +
    +class cdhweb.events.models.EventsLinkPage(*args, **kwargs)[source]
    +

    Container page that defines where Project pages can be created.

    +
    +
    +exception DoesNotExist
    +
    + +
    +
    +exception MultipleObjectsReturned
    -class cdhweb.events.models.Location(id, name, short_name, address, is_virtual)[source]
    +class cdhweb.events.models.Location(id, name, short_name, address, is_virtual)[source]
    -exception DoesNotExist
    +exception DoesNotExist
    -exception MultipleObjectsReturned
    +exception MultipleObjectsReturned
    -clean()[source]
    +clean()[source]

    Hook for doing any extra model-wide validation after clean() has been called on every field by self.clean_fields. Any ValidationError raised by this method will not be associated with a particular field; it will @@ -1112,28 +1135,104 @@

    Models
    -property display_name
    +property display_name

    A name for template display

    +
    +
    +class cdhweb.events.models.OldEvent(*args, **kwargs)[source]
    +

    An event, such as a workshop, lecture, or conference.

    +
    +
    +exception DoesNotExist
    +
    + +
    +
    +exception MultipleObjectsReturned
    +
    + +
    +
    +duration()[source]
    +

    duration between start and end time as datetime.timedelta

    +
    + +
    +
    +full_url()[source]
    +

    Absolute url, including site address

    +
    + +
    +
    +get_absolute_url()[source]
    +

    event detail url on this site

    +
    + +
    +
    +get_ical_url()[source]
    +

    URL to download this event as ical

    +
    + +
    +
    +ical_event()[source]
    +

    Return the current event as a icalendar.Event for +inclusion in a icalendar.Calendar

    +
    + +
    +
    +is_virtual()[source]
    +

    If an event takes place in a virtual location, it is virtual

    +
    + +
    +
    +when()[source]
    +

    Event start/end date and time, formatted for display. +Removes leading zeros from hours and converts am/pm to lower case.

    +
    + +
    + +
    +
    +class cdhweb.events.models.Speaker(*args, **kwargs)[source]
    +

    Relationship between Person and Event.

    +
    +
    +exception DoesNotExist
    +
    + +
    +
    +exception MultipleObjectsReturned
    +
    + +
    +

    Views

    -class cdhweb.events.views.EventDetailView(**kwargs)[source]
    +class cdhweb.events.views.EventDetailView(**kwargs)[source]

    Event detail page

    -
    -get_context_data(*args, **kwargs)[source]
    -

    Insert the single object into the context dict.

    +
    +get(request, *args, **kwargs)[source]
    +

    Serve the requested Event using Wagtail’s Page.serve().

    -get_object(queryset=None)[source]
    +get_object(queryset=None)[source]

    Return the object the view is displaying.

    Require self.queryset and a pk or slug argument in the URLconf. Subclasses can override this to return any object.

    @@ -1143,71 +1242,55 @@

    Views
    -class cdhweb.events.views.EventIcalView(**kwargs)[source]
    +class cdhweb.events.views.EventIcalView(**kwargs)[source]

    Download event information as ical

    -
    -render_to_response(context, **response_kwargs)[source]
    -

    Return a response, using the response_class for this view, with a -template rendered with the given context.

    -

    Pass response_kwargs to the constructor of the response class.

    +
    +get(request, *args, **kwargs)[source]
    +

    Serve the requested Event using Wagtail’s Page.serve().

    -class cdhweb.events.views.EventMixinView[source]
    +class cdhweb.events.views.EventMixinView[source]

    View mixin that sets model to Event and returns a published Event queryset.

    -get_queryset()[source]
    -

    use displayable manager to find published events only

    +get_queryset()[source] +

    use manager to find published events only

    -model
    +model

    alias of cdhweb.events.models.Event

    -
    -
    -class cdhweb.events.views.EventRedirectView(**kwargs)[source]
    -

    Redirect from CDH website v1.0 pk-based urls to new date + slug urls

    -
    -
    -get_redirect_url(*args, **kwargs)[source]
    -

    Return the URL redirect to. Keyword arguments from the URL pattern -match generating the redirect request are provided as kwargs to this -method.

    -
    - -
    -
    -class cdhweb.events.views.EventSemesterArchiveView(**kwargs)[source]
    +class cdhweb.events.views.EventSemesterArchiveView(**kwargs)[source]

    Display events by semester

    -get_context_data(*args, **kwargs)[source]
    +get_context_data(*args, **kwargs)[source]

    Get the context for this view.

    -get_date_list(*args, **kwargs)[source]
    +get_date_list(*args, **kwargs)[source]

    Get a date list by calling queryset.dates/datetimes(), checking along the way for empty lists that aren’t allowed.

    -get_dated_items()[source]
    +get_dated_items()[source]

    Return (date_list, items, extra_context) for this request.

    @@ -1215,12 +1298,18 @@

    Views
    -class cdhweb.events.views.EventSemesterDates[source]
    +class cdhweb.events.views.EventSemesterDates[source]

    Mixin to return list of event semester dates based on event dates in the system.

    +
    +
    +static get_semester(date)[source]
    +

    Return the semester a date occurs in as a string.

    +
    +
    -get_semester_date_list()[source]
    +get_semester_date_list()[source]

    Get a list of semester labels (semester and year) for published events. Semesters are Spring (through May), Summer (through August), and Fall.

    @@ -1230,18 +1319,18 @@

    Views
    -class cdhweb.events.views.UpcomingEventsView(**kwargs)[source]
    +class cdhweb.events.views.UpcomingEventsView(**kwargs)[source]

    Upcoming events view. Displays future published events and 6 most recent past events.

    -get_context_data(*args, **kwargs)[source]
    +get_context_data(*args, **kwargs)[source]

    Get the context for this view.

    -last_modified()[source]
    +last_modified()[source]

    Get the recent last modified date from included events.

    @@ -1257,89 +1346,183 @@

    Views

    Models

    +
    +class cdhweb.blog.models.Author(*args, **kwargs)[source]
    +

    Ordered relationship between Person and BlogPost.

    +
    +
    +exception DoesNotExist
    +
    + +
    +
    +exception MultipleObjectsReturned
    +
    + +
    + +
    +
    +class cdhweb.blog.models.BlogLinkPage(*args, **kwargs)[source]
    +

    Container page that defines where blog posts can be created.

    +
    +
    +exception DoesNotExist
    +
    + +
    +
    +exception MultipleObjectsReturned
    +
    + +
    + +
    -class cdhweb.blog.models.BlogPost(*args, **kwargs)[source]
    -

    A blog post with multiple authors. Based on -mezzanine.blog.models.BlogPost.

    +class cdhweb.blog.models.BlogPost(*args, **kwargs)[source] +

    A Blog post, implemented as a Wagtail page.

    -exception DoesNotExist
    +exception DoesNotExist
    -exception MultipleObjectsReturned
    +exception MultipleObjectsReturned
    -
    -get_absolute_url()[source]
    -

    Raise an error if called on a subclass without -get_absolute_url defined, to ensure all search results -contains a URL.

    +
    +property author_list
    +

    Comma-separated list of author names.

    +
    + +
    +
    +get_sitemap_urls(request)[source]
    +

    Override sitemap listings to add priority for featured posts.

    +
    + +
    +
    +get_url_parts(*args, **kwargs)[source]
    +

    Custom blog post URLs of the form /updates/2014/03/01/my-post.

    -property short_description
    -

    shorter description with ellipsis

    +property short_description +

    Shorter description with ellipsis.

    -property short_title
    -

    shorter title with ellipsis

    +property short_title +

    Shorter title with ellipsis.

    -class cdhweb.blog.models.BlogPostQuerySet(model=None, query=None, using=None, hints=None)[source]
    +class cdhweb.blog.models.BlogPostQuerySet(model=None, query=None, using=None, hints=None)[source]
    -featured()[source]
    +featured()[source]

    return blog posts that are marked as featured

    -recent()[source]
    -

    sort blog posts by publication date

    +recent()[source] +

    Order blog posts by date published.

    +
    +
    +class cdhweb.blog.models.BlogPostTag(*args, **kwargs)[source]
    +

    Tags for Blog posts.

    +
    +
    +exception DoesNotExist
    +
    + +
    +
    +exception MultipleObjectsReturned
    +
    + +
    +
    -class cdhweb.blog.models.MultiOwnable(*args, **kwargs)[source]
    +class cdhweb.blog.models.MultiOwnable(*args, **kwargs)[source]

    Abstract model based on Mezzanine’s mezzanine.core.models.Ownable to provides ownership of an object for a user, except allows for multiple owners.

    -author_list()[source]
    +author_list()[source]

    comma-separated list of authors

    -is_editable(request)[source]
    +is_editable(request)[source]

    Restrict in-line editing to the objects’s owner and superusers.

    +
    +
    +class cdhweb.blog.models.OldBlogPost(*args, **kwargs)[source]
    +

    A blog post with multiple authors. Based on +mezzanine.blog.models.BlogPost.

    +
    +
    +exception DoesNotExist
    +
    + +
    +
    +exception MultipleObjectsReturned
    +
    + +
    +
    +get_absolute_url()[source]
    +

    Raise an error if called on a subclass without +get_absolute_url defined, to ensure all search results +contains a URL.

    +
    + +
    +
    +property short_description
    +

    shorter description with ellipsis

    +
    + +
    +
    +property short_title
    +

    shorter title with ellipsis

    +
    + +
    +

    Views

    -class cdhweb.blog.views.AtomBlogPostFeed[source]
    +class cdhweb.blog.views.AtomBlogPostFeed[source]

    Blog post Atom feed

    -feed_type
    +feed_type

    alias of django.utils.feedgenerator.Atom1Feed

    @@ -1347,29 +1530,35 @@

    Views
    -class cdhweb.blog.views.BlogDetailView(**kwargs)[source]
    +class cdhweb.blog.views.BlogDetailView(**kwargs)[source]

    Blog post detail view

    -get_context_data(*args, **kwargs)[source]
    -

    Insert the single object into the context dict.

    +get_context_data(*args, **kwargs)[source] +

    Add next/previous post to context.

    -class cdhweb.blog.views.BlogIndexView(**kwargs)[source]
    +class cdhweb.blog.views.BlogIndexView(**kwargs)[source]

    Main blog post list view

    +
    +
    +get_context_data(*args, **kwargs)[source]
    +

    Get the context for this view.

    +
    +
    -class cdhweb.blog.views.BlogMonthArchiveView(**kwargs)[source]
    +class cdhweb.blog.views.BlogMonthArchiveView(**kwargs)[source]

    Blog post archive by month

    -get_context_data(*args, **kwargs)[source]
    +get_context_data(*args, **kwargs)[source]

    Get the context for this view.

    @@ -1377,18 +1566,23 @@

    Views
    -class cdhweb.blog.views.BlogPostArchiveMixin(**kwargs)[source]
    +class cdhweb.blog.views.BlogPostArchiveMixin(**kwargs)[source]

    Mixin with common settings for blogpost archive views

    -class cdhweb.blog.views.BlogPostMixinView[source]
    -

    View mixin that sets model to Blogpost and returns a -published BlogPost queryset.

    +class cdhweb.blog.views.BlogPostMixinView[source] +

    Mixin that sets model to BlogPost and orders/filters queryset.

    +
    +
    +get_queryset()[source]
    +

    Return published posts with most recent first.

    +
    +
    -model
    +model

    alias of cdhweb.blog.models.BlogPost

    @@ -1396,11 +1590,11 @@

    Views
    -class cdhweb.blog.views.BlogYearArchiveView(**kwargs)[source]
    +class cdhweb.blog.views.BlogYearArchiveView(**kwargs)[source]

    Blog post archive by year

    -get_context_data(*args, **kwargs)[source]
    +get_context_data(*args, **kwargs)[source]

    Get the context for this view.

    @@ -1408,60 +1602,66 @@

    Views
    -class cdhweb.blog.views.RssBlogPostFeed[source]
    +class cdhweb.blog.views.RssBlogPostFeed[source]

    Blog post RSS feed

    +
    +
    +item_author_email(item)[source]
    +

    author email, if there is only one author

    +
    +
    +item_author_link(item)[source]

    link to author profile page, if there is only one author and the author has a published profile

    -item_author_name(item)[source]
    +item_author_name(item)[source]

    author of the blog post; comma-separated list for multiple

    -item_categories(item)[source]
    +item_categories(item)[source]

    keyword category terms

    -item_description(item)[source]
    +item_description(item)[source]

    blog post description, for feed content

    +item_link(item)[source]

    absolute link to blog post

    -item_pubdate(item)[source]
    +item_pubdate(item)[source]

    publication date

    -item_title(item)[source]
    +item_title(item)[source]

    blog post title

    -
    -item_updatedate(item)[source]
    +
    +item_updateddate(item)[source]

    last modified date

    -items()[source]
    +items()[source]

    ten most recent blog posts, ordered by publish date

    @@ -1592,7 +1792,7 @@

    Quick search

    ©2017, CDH @ Princeton & Trustees of Princeton University. | - Powered by Sphinx 3.3.1 + Powered by Sphinx 3.5.3 & Alabaster 0.7.12 | diff --git a/docs/deploynotes.html b/docs/deploynotes.html index 249f30dce..80f37fb94 100644 --- a/docs/deploynotes.html +++ b/docs/deploynotes.html @@ -5,14 +5,13 @@ - Deploy Notes — CDH website 2.8.0 documentation + Deploy Notes — CDH website 3.0.0 documentation - @@ -35,7 +34,21 @@

    Deploy Notes

    -

    2.8

    +

    3.0

    +
      +

    • After deployment, the main exodus script should be run to move content from +mezzanine to wagtail with python manage.py exodus.

      • +
    +
    +
    +

    2.8.1

    +
      +

    • Data will need to be migrated out of the existing database and into a Postgres +database. The pgloader tool can be used for this purpose.

      • +
    +
    +
    +

    2.8

    • The “Postdocs” list page has been removed, so its corresponding page should be deleted in Mezzanine.

      • @@ -50,8 +63,8 @@

      2.8

    -
    -

    2.7

    +
    +

    2.7

    • The “Faculty Affiliates” page has changed to show both Faculty and Staff, and thus its title and content should be updated accordingly in Mezzanine.

      • @@ -59,8 +72,8 @@

      2.7

    -
    -

    2.6

    +
    +

    2.6

    • Adds a cosponsorship request form embed template similar to the consult form. A RichTextPage needs to be created with its url set to /events/cosponsor @@ -70,8 +83,8 @@

      2.6/events.

    -
    -

    2.2

    +
    +

    2.2

    • Adds an alumni page, parallel to current staff. Existing profile pages for past staff should be republished.

      • @@ -79,16 +92,16 @@

      2.2

    -
    -

    2.1

    +
    +

    2.1

    • Resource names have been changed to store proper case in the database. Existing installations should update the three pre-populated items manually.

    • Update local settings to turn on Google Analytics.

    -
    -

    2.0

    +
    +

    2.0

    @@ -169,12 +184,14 @@

    Navigation

    Table of Contents

    @@ -203,7 +220,7 @@

    Quick search

    ©2017, CDH @ Princeton & Trustees of Princeton University. | - Powered by Sphinx 3.3.1 + Powered by Sphinx 3.5.3 & Alabaster 0.7.12 | diff --git a/docs/genindex.html b/docs/genindex.html index 20cff02df..8ab028380 100644 --- a/docs/genindex.html +++ b/docs/genindex.html @@ -5,14 +5,13 @@ - Index — CDH website 2.8.0 documentation + Index — CDH website 3.0.0 documentation - @@ -62,22 +61,36 @@

    A

    - + @@ -87,6 +100,12 @@

    B

  • BlogDetailView (class in cdhweb.blog.views)
  • BlogIndexView (class in cdhweb.blog.views) +
    • +
  • BlogLinkPage (class in cdhweb.blog.models) +
    • +
  • BlogLinkPage.DoesNotExist +
    • +
  • BlogLinkPage.MultipleObjectsReturned
  • BlogMonthArchiveView (class in cdhweb.blog.views)
    • @@ -103,6 +122,12 @@

    B

  • BlogPostMixinView (class in cdhweb.blog.views)
  • BlogPostQuerySet (class in cdhweb.blog.models) +
    • +
  • BlogPostTag (class in cdhweb.blog.models) +
    • +
  • BlogPostTag.DoesNotExist +
    • +
  • BlogPostTag.MultipleObjectsReturned
  • BlogYearArchiveView (class in cdhweb.blog.views)
    • @@ -112,7 +137,7 @@

    B

    C

    - +
    -
    • cdhweb.projects @@ -186,6 +209,8 @@

      C

    • module
    +
    • cdhweb.projects.models @@ -214,25 +239,39 @@

      C

    • module
    -
  • clean() (cdhweb.events.models.Location method) +
  • clean() (cdhweb.events.models.Event method) + +
  • clean_fields() (cdhweb.resources.models.DateRange method)
    • -
  • current() (cdhweb.people.models.ProfileQuerySet method) +
  • cleanup_profile() (cdhweb.people.models.Person method) +
    • +
  • current() (cdhweb.people.models.PersonQuerySet method)
    • -
  • current_grant() (cdhweb.people.models.ProfileQuerySet method) +
  • current_grant() (cdhweb.people.models.PersonQuerySet method) +
    • +
  • current_memberships() (cdhweb.projects.models.OldProject method) + +
    • +
  • current_position() (cdhweb.people.models.PersonQuerySet method)
    • -
  • current_position() (cdhweb.people.models.ProfileQuerySet method) +
  • current_position_nonexec() (cdhweb.people.models.PersonQuerySet method)
    • -
  • current_position_nonexec() (cdhweb.people.models.ProfileQuerySet method) +
  • current_title (cdhweb.people.views.PersonListView attribute)
    • -
  • current_title (cdhweb.people.views.ProfileListView attribute) +
  • current_title() (cdhweb.people.models.Person property)
    • @@ -242,16 +281,18 @@

    D

    @@ -274,13 +315,23 @@

    E

  • EventQuerySet (class in cdhweb.events.models)
    • -
  • EventRedirectView (class in cdhweb.events.views) +
  • EventSemesterArchiveView (class in cdhweb.events.views) +
    • +
  • EventSemesterDates (class in cdhweb.events.views) +
    • +
  • EventsLinkPage (class in cdhweb.events.models)

@@ -308,7 +359,7 @@

F

@@ -316,26 +367,32 @@

F

G

- +
    +
  • get_past() (cdhweb.people.views.PersonListView method)
    • -
  • get_queryset() (cdhweb.events.views.EventMixinView method) +
  • get_queryset() (cdhweb.blog.views.BlogPostMixinView method)
    • -
  • get_redirect_url() (cdhweb.events.views.EventRedirectView method) +
  • get_semester() (cdhweb.events.views.EventSemesterDates static method)
  • get_semester_date_list() (cdhweb.events.views.EventSemesterDates method)
    • +
  • get_sitemap_urls() (cdhweb.blog.models.BlogPost method) + +
    • +
  • get_url_parts() (cdhweb.blog.models.BlogPost method) + +
  • Grant (class in cdhweb.projects.models)
  • Grant.DoesNotExist
  • Grant.MultipleObjectsReturned
    • -
  • grant_years() (cdhweb.people.models.ProfileQuerySet method) +
  • grant_years() (cdhweb.people.models.PersonQuerySet method)
  • GrantType (class in cdhweb.projects.models)
    • @@ -431,10 +500,6 @@

    G

    H

    -
    • highlighted() (cdhweb.projects.models.ProjectQuerySet method)
      • @@ -445,21 +510,31 @@

      I

      + - - + @@ -573,7 +652,7 @@

      N

        -
      • not_students() (cdhweb.people.models.ProfileQuerySet method) +
      • not_students() (cdhweb.people.models.PersonQuerySet method)
      • num_people() (cdhweb.people.models.Title method)
        • @@ -583,13 +662,35 @@

        N

        O

        @@ -597,15 +698,39 @@

        O

        P

        + - @@ -679,18 +798,10 @@

        R

      • (cdhweb.events.models.EventQuerySet method)
        • -
      • render_to_response() (cdhweb.events.views.EventIcalView method) -
        • -
      • ResourceType (class in cdhweb.resources.models) -
        • -
      • ResourceType.DoesNotExist +
      • Role (class in cdhweb.projects.models)
          • -
        • ResourceType.MultipleObjectsReturned -
          • -
        • Role (class in cdhweb.projects.models) -
        • Role.DoesNotExist
        • Role.MultipleObjectsReturned @@ -704,38 +815,30 @@

          S

            -
          • SpeakerListView (class in cdhweb.people.views) -
            • -
          • speakers() (cdhweb.people.models.ProfileQuerySet method) -
            • -
          • staff() (cdhweb.people.models.ProfileQuerySet method) +
          • SponsoredProjectListView (class in cdhweb.projects.views)
          • staff_or_postdoc() (cdhweb.projects.models.ProjectQuerySet method)
            • @@ -747,11 +850,11 @@

            S

          • start_date (cdhweb.resources.models.DateRange attribute)
            • -
          • student_affiliates() (cdhweb.people.models.ProfileQuerySet method) +
          • student_affiliates() (cdhweb.people.models.PersonQuerySet method)
            • -
          • student_pu_status (cdhweb.people.models.ProfileQuerySet attribute) +
          • student_pu_status (cdhweb.people.models.PersonQuerySet attribute)
            • -
          • student_titles (cdhweb.people.models.ProfileQuerySet attribute) +
          • student_titles (cdhweb.people.models.PersonQuerySet attribute)
          • StudentListView (class in cdhweb.people.views)
            • @@ -776,16 +879,12 @@

            U

            @@ -793,16 +892,20 @@

            U

            W

            - +
            Unit test status -Code Health -Code coverage -Requirements Status -

            Python 3.5 / Django 2.2 / Node 10 / MariaDB (MySQL) 5.5 w/ timezone info

            -

            cdhweb is a Django+Mezzanine application that powers the CDH website +Code coverage +Requirements Status +dbdocs build +

            Python 3.6 / Django 2.2 / Node 10 / PostgreSQL 10 +cdhweb is a Django+Mezzanine application that powers the CDH website with custom models for people, events, and projects.

            View software and architecture documentation for the current release.

            -

            This repository uses git-flow conventions; master +

            This repository uses git-flow conventions; main contains the most recent release, and work in progress will be on the develop branch. Pull requests should be made against develop.

            Development instructions

            Initial setup and installation:

              -

            • Recommended: create and activate a python 3.5 virtualenv:

              -
              virtualenv cdhweb -p python3.5
+
            • Recommended: create and activate a python 3.6 virtualenv:
              
+
              virtualenv cdhweb -p python3.6
 source cdhweb/bin/activate
 
              
 
              
@@ -138,6 +141,7 @@ 
              Development instructionsMariaDB’s
 info on the utility for more information.
              
 
              • 
+
            • Install OpenCV dependencies (if necessary) for [wagtail image feature detection](https://docs.wagtail.io/en/stable/advanced_topics/images/feature_detection.html)
              •
            @@ -168,11 +172,16 @@

            Documentationdbdocs @ princetoncdh/cdh-web. But to generate locally, install and log into dbdocs. Then run:

            +
            python manage.py dbml > cdhweb.dbml
+npx dbdocs build cdhweb.dbml --project cdhweb
+
            +

            License

            -

            This project is licensed under the Apache 2.0 License.

            +

            This project is licensed under the Apache 2.0 License.

            ©2019 Trustees of Princeton University. Permission granted via Princeton Docket #20-2634 for distribution online under a standard Open Source license. Ownership rights transferred to Rebecca Koeser provided software @@ -285,7 +294,7 @@

            Quick search

            ©2017, CDH @ Princeton & Trustees of Princeton University. | - Powered by Sphinx 3.3.1 + Powered by Sphinx 3.5.3 & Alabaster 0.7.12 | diff --git a/docs/objects.inv b/docs/objects.inv index b9d1a2063a2e248b6a57f37f3989bb9780dfe046..b9a6c0909d32c3077939db7730c683def2ce029c 100644 GIT binary patch delta 2070 zcmV+x2OujVw@+}zl8GGoWC-H+)B1Cc8U z4N0&7Xj}ij06|iuL{j)z9WoPBdLQjB7QkXDD$RE9uuj%F->$0t=YnT-4y#{QDbFC| zsZ4gN$bYhzuYX=$U!?~@qAx=(Lv_hbt#(`(d74uxSD%j5i?ZaFgZ$3bf87U@$}r#~ zg-S7AdU77?T(K&Lr}e*(D)|Dc7A0gs$Y1sUA6WV0nQp<`uc0{JyAciB$7gP>^7hXN zaeQk?m+&j0O4$(aw@^ltz$>3KheV+AT#gkf~rcG_fqj zR1V>k-)j*2R|rp~4v=hsf9j#PBOhl=A|Qn_V&wmz+hBjR7H@VK80G|NSWoXIUFZIb z+fW=g!$u?~31m!lCi#(`@+^2U8))N4YzV^~u_4ziB6KZzUMn!GNmRHnmXcGP?`rbK z;60%FXk^Ka;zjrQzkv;~TLw()^%4XbQTwX#fGQ=}T8G+^W=OZ7e<;iU(trEfGFCT3 zo$^w_haMuTsBcIc-nTM?k5FTJF^(;d8nC+&>5jcYs7c2R9Lvn;x6nuS!O9TJ45JZ; zx;6qde*I@QGYKl#rvt8;t)VIX4^R;~ZbyjtVSAA>X5Jsk6I0@mc0<#}9?N458WD3{ z!J`68S^y3(r3$uOe=v|Zys*t=0f-m7s$T0WpK1ss%KEzTtXnyV76)j5Vg@U&l5Jw5HD7(Vu_%Xk;Q z_w9ddjoVy}grS1iEM82D-<_?9x4CQ|G~(bPoyZ2Q9#2N{1d4x9uM= zQ9FN+3Ej3|e{Inakjt$SBb7T8QYQO1+lE5BN_%#=mH;N@yoP3$LUonnw%zfZov(&98NIN_vF?qyp~_k`pPgk>t)cr*i*egCjU2-sklx^sPq8$e1<^ zd%Lr}f@0N(7!}Mv+vAEY6vMLUl!1{y6I5-LB6{Mme+_fJn^^&`+K!Uz(rhIm?U<3$ z?3B-fZEDK7){s2dOC` zj*AWH5`NhuR9%tkFdzI=!;)$t^m^daD4yixW*JpvE2wKVJ&7r}hS=6ov`KAn!skvy zY1`g}e=6tVVv6I{S6c!kbfdju-Ci2zRS(neAyR212Fs=r9w|1PPIwiU%>6*@g(M{} z;R8|xbjI`qP+Snfb34e=NxZY!?rba2PvLl0(e?NLHHQN^{XsI`Affmk=i{!U&1s|RePfnLPHg!~wTMN^G!8tnw^GCNCdIq@BVT9L$aD!`^WnGZL;ombbtYmtv ze`}^M*$7^cJfoEXZR#?0G{?UwJQOB3-SYjQ!|U9bSw`4=38;IQcz!+65%5m$c;W61 z)qx$SGrZtPouDFuWOtG9Fpc%6CupA?can$@`YB>?@F!pul}IGCf%LosutchKjf*&* zCRj1JS93rQ&)1PWG8Il)5##r2i`5v^!F^P&UK&Gh9Uv-*QBf5z4b*E$UW7ATRJ5~kxd645cI^bb@YVUJ&x5B+WJ;-r9 z9q=yaX+rbb^)BiHrK>lJestoQf%lr`fdRJz=3)9}^KfgpVKJ$OnrD|vGK366e^0Mr zZuvi(JV%R9EbOfEyR);*@Vtj|2DW3{U9SHr=bQUyfTsD4YN73>>ynaiLE64G4!Liv zm++30FoPcJB@DLIu6N&<>(ReG1Aph@2P?N4%j?Mb?A;bVi$PslQJcflAL05y!Mq&R zV~ht2X3*06nX!@M>^95)*hnqL78)RDA{y5E6)5fR$!a)1Wy zQ}aBJzQTD}SZ84d=-KyLhK01g&Jq2)Ut{8H#Y@QrWC-~;$BG}8rZt9P;RGk%y1#7& zaBm8L80)4uIFopm?B}-t$!n2<-$K``LK<<$;^amtn(hkMCyW;KVcWypjE$x;7 zNLh+m%$>lW>vhiL4zli0>M)thd<5Z5-63kGHh4z}&yxP}I2%=v753}PA`6D+7 AMF0Q* delta 1888 zcmV-m2cP)(5X29VKLau@IFUj=e@k=QHV}aC{uP>Oui-S;+}t>IGGiyMowm~x1|nA? z5|Us6(6au0@gQVUq9_7bA2JhD+E4q!Vi%;87v&Dt*}CG}RlEOC^P;O@_1h}v1r$7& zS*hyk7kByHud8=g`Kv&tFGD3`<+9)P{~x$i29Q@&%GLWL`3r*C4F~y^f2&U~%u(Pa zhgLD(1e5N&O0l+rZ|fhBEBOej6Act;&@CuJ*OFJA0@8`fdJ0s@i(r&2xlp74nG5EW zNo6Ufbi|@5e|8}DPY@qG56Ct^wX>bC({#xMY?}S zg*7pn8HN>(HEjfN3nDgY{sk%$9espI_w%EaDJ$zpJYx!Ka;P=Uf6r8XM!<&FfCJ2_ zf-M&eBn~fb|C<5g`L6BOIx&#^7P>djpt{zmg{IoVK*F=$hr{+EClb?BjwG{B&wUGU zaeYn5#dVZZpwxzPidl4mF3hyh*Wg52?@jz zBd-0QL{(;8e<-pQbZN&riD?DjuqssZ>U^`ey*i6#! z23{b?V7ms83nF;sqO+(!orfCbNDcKG1cr_S-0P_%f0CM=(p{TwI_jD!1%RQh%_Xu2 zDp0b$q>}if5HdK^OvE-^_kyY`uy|aU0dBnyIR{%v#9T|7rL>sKBdmPa+rO#dq^1qs zYMs$y@4=XhQ~Oeq9aAO2sv)uk`V(+0j_(amKsL7t?$+a}ZD+bz)u9EY=O(4)cV8O= zcWWz$f6>}F5N>1Rm`zuc!B7?$Mb>$l#V=XxWG$~#R)SZ z3?mj&1p3Mqc(Of@z=*{(G{Jd2Fh1Lk0Ead{f2xI@M&kJmJB_EXtvQH8X5s}nYjy92 z860aaBF`>h-_E42-#01?W9;j+f&@H_=}5dEe2oyHuv<>EguvTGBi55^!{ZCq5df%nr8&wHo5>S z*|x0oKehO7?FFDYk4M$e9q{Yjo^V0>e`9YP^5I~V{`$vNf9P9N zpi{J);^1W2S#p@&qA#Oi_2M8EGrArNXV*&6ysVdg|7k`(t{Tq)Q;YHm+dNkLNSiIh z*?JIn-*X@v22~*gV|@yPrXc>yc8gZ?42#LIu5<>ayD*{96bpF9;)HTXn?f(Q2O1l= z0RSmWheY%=eee&K`lfaHSF9JZe?p&KJ;C}8aPiU5ECDGfBP4oM{*oYqI{sM#lF1`v zw8_+b8$xNBPQXe}T_4OS_wM~_c-_8xbv?Lpm6v8|o1cLh$Q&*@fsdcBzutbj`*wTf zKX&xyp(?A7`mfau&pT87?Lq!k0d2+idNziU+~Beky|EWoU(J=PEi}yhQtX12sOVZZ zN?OKWbprNx8LnR6)`JJ{_;~Yq)gO$kijh+0%L%9acK^=5-~jh-Q+A&;c=dwV!(Ok( aW-Kkigkmh{t~r?}_qr)ZSN{V>W(?boBA7}5 diff --git a/docs/py-modindex.html b/docs/py-modindex.html index 5b6d70e53..54b409b39 100644 --- a/docs/py-modindex.html +++ b/docs/py-modindex.html @@ -5,14 +5,13 @@ - Python Module Index — CDH website 2.8.0 documentation + Python Module Index — CDH website 3.0.0 documentation - @@ -206,7 +205,7 @@

            Quick search

            ©2017, CDH @ Princeton & Trustees of Princeton University. | - Powered by Sphinx 3.3.1 + Powered by Sphinx 3.5.3 & Alabaster 0.7.12
            diff --git a/docs/search.html b/docs/search.html index 96eafeebe..7f94ae998 100644 --- a/docs/search.html +++ b/docs/search.html @@ -5,7 +5,7 @@ - Search — CDH website 2.8.0 documentation + Search — CDH website 3.0.0 documentation @@ -13,8 +13,8 @@ - + @@ -130,7 +130,7 @@

            Navigation

            ©2017, CDH @ Princeton & Trustees of Princeton University. | - Powered by Sphinx 3.3.1 + Powered by Sphinx 3.5.3 & Alabaster 0.7.12 diff --git a/docs/searchindex.js b/docs/searchindex.js index 1e360b76a..74615d192 100644 --- a/docs/searchindex.js +++ b/docs/searchindex.js @@ -1 +1 @@ -Search.setIndex({docnames:["architecture","changelog","codedocs","deploynotes","index"],envversion:{"sphinx.domains.c":2,"sphinx.domains.changeset":1,"sphinx.domains.citation":1,"sphinx.domains.cpp":3,"sphinx.domains.index":1,"sphinx.domains.javascript":2,"sphinx.domains.math":2,"sphinx.domains.python":2,"sphinx.domains.rst":2,"sphinx.domains.std":1,"sphinx.ext.intersphinx":1,"sphinx.ext.viewcode":1,sphinx:56},filenames:["architecture.rst","changelog.rst","codedocs.rst","deploynotes.rst","index.rst"],objects:{"cdhweb.blog":{models:[2,0,0,"-"],views:[2,0,0,"-"]},"cdhweb.blog.models":{BlogPost:[2,1,1,""],BlogPostQuerySet:[2,1,1,""],MultiOwnable:[2,1,1,""]},"cdhweb.blog.models.BlogPost":{DoesNotExist:[2,2,1,""],MultipleObjectsReturned:[2,2,1,""],get_absolute_url:[2,3,1,""],short_description:[2,3,1,""],short_title:[2,3,1,""]},"cdhweb.blog.models.BlogPostQuerySet":{featured:[2,3,1,""],recent:[2,3,1,""]},"cdhweb.blog.models.MultiOwnable":{author_list:[2,3,1,""],is_editable:[2,3,1,""]},"cdhweb.blog.views":{AtomBlogPostFeed:[2,1,1,""],BlogDetailView:[2,1,1,""],BlogIndexView:[2,1,1,""],BlogMonthArchiveView:[2,1,1,""],BlogPostArchiveMixin:[2,1,1,""],BlogPostMixinView:[2,1,1,""],BlogYearArchiveView:[2,1,1,""],RssBlogPostFeed:[2,1,1,""]},"cdhweb.blog.views.AtomBlogPostFeed":{feed_type:[2,4,1,""]},"cdhweb.blog.views.BlogDetailView":{get_context_data:[2,3,1,""]},"cdhweb.blog.views.BlogMonthArchiveView":{get_context_data:[2,3,1,""]},"cdhweb.blog.views.BlogPostMixinView":{model:[2,4,1,""]},"cdhweb.blog.views.BlogYearArchiveView":{get_context_data:[2,3,1,""]},"cdhweb.blog.views.RssBlogPostFeed":{item_author_link:[2,3,1,""],item_author_name:[2,3,1,""],item_categories:[2,3,1,""],item_description:[2,3,1,""],item_link:[2,3,1,""],item_pubdate:[2,3,1,""],item_title:[2,3,1,""],item_updatedate:[2,3,1,""],items:[2,3,1,""]},"cdhweb.events":{models:[2,0,0,"-"],views:[2,0,0,"-"]},"cdhweb.events.models":{Event:[2,1,1,""],EventQuerySet:[2,1,1,""],EventType:[2,1,1,""],Location:[2,1,1,""]},"cdhweb.events.models.Event":{DoesNotExist:[2,2,1,""],MultipleObjectsReturned:[2,2,1,""],duration:[2,3,1,""],full_url:[2,3,1,""],get_absolute_url:[2,3,1,""],get_ical_url:[2,3,1,""],ical_event:[2,3,1,""],is_virtual:[2,3,1,""],when:[2,3,1,""]},"cdhweb.events.models.EventQuerySet":{recent:[2,3,1,""],upcoming:[2,3,1,""]},"cdhweb.events.models.EventType":{DoesNotExist:[2,2,1,""],MultipleObjectsReturned:[2,2,1,""]},"cdhweb.events.models.Location":{DoesNotExist:[2,2,1,""],MultipleObjectsReturned:[2,2,1,""],clean:[2,3,1,""],display_name:[2,3,1,""]},"cdhweb.events.views":{EventDetailView:[2,1,1,""],EventIcalView:[2,1,1,""],EventMixinView:[2,1,1,""],EventRedirectView:[2,1,1,""],EventSemesterArchiveView:[2,1,1,""],EventSemesterDates:[2,1,1,""],UpcomingEventsView:[2,1,1,""]},"cdhweb.events.views.EventDetailView":{get_context_data:[2,3,1,""],get_object:[2,3,1,""]},"cdhweb.events.views.EventIcalView":{render_to_response:[2,3,1,""]},"cdhweb.events.views.EventMixinView":{get_queryset:[2,3,1,""],model:[2,4,1,""]},"cdhweb.events.views.EventRedirectView":{get_redirect_url:[2,3,1,""]},"cdhweb.events.views.EventSemesterArchiveView":{get_context_data:[2,3,1,""],get_date_list:[2,3,1,""],get_dated_items:[2,3,1,""]},"cdhweb.events.views.EventSemesterDates":{get_semester_date_list:[2,3,1,""]},"cdhweb.events.views.UpcomingEventsView":{get_context_data:[2,3,1,""],last_modified:[2,3,1,""]},"cdhweb.people":{models:[2,0,0,"-"],views:[2,0,0,"-"]},"cdhweb.people.models":{Person:[2,1,1,""],Position:[2,1,1,""],Profile:[2,1,1,""],ProfileQuerySet:[2,1,1,""],Title:[2,1,1,""],init_profile_from_ldap:[2,5,1,""]},"cdhweb.people.models.Person":{DoesNotExist:[2,2,1,""],MultipleObjectsReturned:[2,2,1,""],cdh_staff:[2,3,1,""],get_absolute_url:[2,3,1,""],latest_grant:[2,3,1,""],profile_url:[2,3,1,""],published:[2,3,1,""],website_url:[2,3,1,""]},"cdhweb.people.models.Position":{DoesNotExist:[2,2,1,""],MultipleObjectsReturned:[2,2,1,""]},"cdhweb.people.models.Profile":{DoesNotExist:[2,2,1,""],MultipleObjectsReturned:[2,2,1,""],get_absolute_url:[2,3,1,""]},"cdhweb.people.models.ProfileQuerySet":{affiliates:[2,3,1,""],current:[2,3,1,""],current_grant:[2,3,1,""],current_position:[2,3,1,""],current_position_nonexec:[2,3,1,""],director_roles:[2,4,1,""],exec_member:[2,3,1,""],exec_member_title:[2,4,1,""],executive_committee:[2,3,1,""],grant_years:[2,3,1,""],has_upcoming_events:[2,3,1,""],not_students:[2,3,1,""],order_by_event:[2,3,1,""],order_by_position:[2,3,1,""],postdoc_titles:[2,4,1,""],project_manager_years:[2,3,1,""],project_roles:[2,4,1,""],sits_with_exec:[2,3,1,""],speakers:[2,3,1,""],staff:[2,3,1,""],student_affiliates:[2,3,1,""],student_pu_status:[2,4,1,""],student_titles:[2,4,1,""]},"cdhweb.people.models.Title":{DoesNotExist:[2,2,1,""],MultipleObjectsReturned:[2,2,1,""],num_people:[2,3,1,""]},"cdhweb.people.views":{AffiliateListView:[2,1,1,""],ExecListView:[2,1,1,""],ProfileDetailView:[2,1,1,""],ProfileListView:[2,1,1,""],ProfileMixinView:[2,1,1,""],SpeakerListView:[2,1,1,""],StaffListView:[2,1,1,""],StudentListView:[2,1,1,""]},"cdhweb.people.views.AffiliateListView":{get_current_profiles:[2,3,1,""],get_queryset:[2,3,1,""],show_cdh_position:[2,4,1,""]},"cdhweb.people.views.ExecListView":{get_context_data:[2,3,1,""],get_current_profiles:[2,3,1,""],get_queryset:[2,3,1,""],show_cdh_position:[2,4,1,""]},"cdhweb.people.views.ProfileDetailView":{get_context_data:[2,3,1,""],get_queryset:[2,3,1,""]},"cdhweb.people.views.ProfileListView":{current_title:[2,4,1,""],get_context_data:[2,3,1,""],get_current_profiles:[2,3,1,""],get_past_profiles:[2,3,1,""],get_queryset:[2,3,1,""],page_title:[2,4,1,""],past_title:[2,4,1,""],show_affiliation:[2,4,1,""],show_cdh_position:[2,4,1,""],show_events:[2,4,1,""],show_grant:[2,4,1,""],show_job_title:[2,4,1,""]},"cdhweb.people.views.ProfileMixinView":{model:[2,4,1,""]},"cdhweb.people.views.SpeakerListView":{get_current_profiles:[2,3,1,""],get_past_profiles:[2,3,1,""],get_queryset:[2,3,1,""],show_affiliation:[2,4,1,""]},"cdhweb.people.views.StaffListView":{get_current_profiles:[2,3,1,""],get_queryset:[2,3,1,""]},"cdhweb.people.views.StudentListView":{get_past_profiles:[2,3,1,""],get_queryset:[2,3,1,""]},"cdhweb.projects":{models:[2,0,0,"-"],views:[2,0,0,"-"]},"cdhweb.projects.models":{Grant:[2,1,1,""],GrantType:[2,1,1,""],Membership:[2,1,1,""],Project:[2,1,1,""],ProjectQuerySet:[2,1,1,""],ProjectResource:[2,1,1,""],Role:[2,1,1,""]},"cdhweb.projects.models.Grant":{DoesNotExist:[2,2,1,""],MultipleObjectsReturned:[2,2,1,""]},"cdhweb.projects.models.GrantType":{DoesNotExist:[2,2,1,""],MultipleObjectsReturned:[2,2,1,""]},"cdhweb.projects.models.Membership":{DoesNotExist:[2,2,1,""],MultipleObjectsReturned:[2,2,1,""]},"cdhweb.projects.models.Project":{DoesNotExist:[2,2,1,""],MultipleObjectsReturned:[2,2,1,""],alums:[2,3,1,""],current_memberships:[2,3,1,""],get_absolute_url:[2,3,1,""],latest_grant:[2,3,1,""],website_url:[2,3,1,""]},"cdhweb.projects.models.ProjectQuerySet":{current:[2,3,1,""],highlighted:[2,3,1,""],not_current:[2,3,1,""],not_staff_or_postdoc:[2,3,1,""],order_by_newest_grant:[2,3,1,""],staff_or_postdoc:[2,3,1,""],staff_postdoc_grants:[2,4,1,""],working_groups:[2,3,1,""]},"cdhweb.projects.models.ProjectResource":{DoesNotExist:[2,2,1,""],MultipleObjectsReturned:[2,2,1,""],display_url:[2,3,1,""]},"cdhweb.projects.models.Role":{DoesNotExist:[2,2,1,""],MultipleObjectsReturned:[2,2,1,""]},"cdhweb.projects.views":{ProjectDetailView:[2,1,1,""],ProjectListMixinView:[2,1,1,""],ProjectListView:[2,1,1,""],ProjectMixinView:[2,1,1,""],StaffProjectListView:[2,1,1,""],WorkingGroupListView:[2,1,1,""]},"cdhweb.projects.views.ProjectDetailView":{get_context_data:[2,3,1,""]},"cdhweb.projects.views.ProjectListMixinView":{get_context_data:[2,3,1,""]},"cdhweb.projects.views.ProjectListView":{get_queryset:[2,3,1,""]},"cdhweb.projects.views.ProjectMixinView":{model:[2,4,1,""]},"cdhweb.projects.views.StaffProjectListView":{get_queryset:[2,3,1,""]},"cdhweb.projects.views.WorkingGroupListView":{get_context_data:[2,3,1,""],get_queryset:[2,3,1,""]},"cdhweb.resources":{models:[2,0,0,"-"]},"cdhweb.resources.models":{Attachment:[2,1,1,""],DateRange:[2,1,1,""],LandingPage:[2,1,1,""],PublishedQuerySetMixin:[2,1,1,""],ResourceType:[2,1,1,""],UserResource:[2,1,1,""]},"cdhweb.resources.models.Attachment":{DoesNotExist:[2,2,1,""],MultipleObjectsReturned:[2,2,1,""]},"cdhweb.resources.models.DateRange":{clean_fields:[2,3,1,""],end_date:[2,4,1,""],is_current:[2,3,1,""],start_date:[2,4,1,""],years:[2,3,1,""]},"cdhweb.resources.models.LandingPage":{DoesNotExist:[2,2,1,""],MultipleObjectsReturned:[2,2,1,""]},"cdhweb.resources.models.PublishedQuerySetMixin":{published:[2,3,1,""]},"cdhweb.resources.models.ResourceType":{DoesNotExist:[2,2,1,""],MultipleObjectsReturned:[2,2,1,""]},"cdhweb.resources.models.UserResource":{DoesNotExist:[2,2,1,""],MultipleObjectsReturned:[2,2,1,""]},cdhweb:{blog:[2,0,0,"-"],events:[2,0,0,"-"],people:[2,0,0,"-"],projects:[2,0,0,"-"],resources:[2,0,0,"-"]}},objnames:{"0":["py","module","Python module"],"1":["py","class","Python class"],"2":["py","exception","Python exception"],"3":["py","method","Python method"],"4":["py","attribute","Python attribute"],"5":["py","function","Python function"]},objtypes:{"0":"py:module","1":"py:class","2":"py:exception","3":"py:method","4":"py:attribute","5":"py:function"},terms:{"2019":4,"2634":4,"abstract":2,"break":3,"case":[2,3],"class":2,"default":[2,3],"export":3,"function":1,"import":3,"new":[1,2,3],"null":1,"public":[1,2],"return":2,"true":2,For:2,The:[2,3],Then:4,Use:[1,4],Uses:2,_meta_titl:2,_order:2,abl:1,about:[1,2],absolut:2,access:1,accordingli:3,accur:1,across:1,action:1,activ:[1,2,4],actual:1,add:[1,2,3,4],adding:[1,3],address:[1,2],adjust:1,admin:[1,3],affili:[1,2,3],affiliatelistview:2,after:2,against:4,alia:2,all:[1,2,4],allow:[1,2],along:2,alt:1,alum:[1,2],alumni:[1,3],alwai:1,analyt:3,ani:[1,2,3],annot:2,apach:4,app:2,applic:[1,4],architectur:4,archiv:2,aren:[1,2],arg:2,argument:2,assign:3,assist:[1,2],associ:[1,2],assum:2,atom1fe:2,atom:2,atomblogpostfe:2,attach:[1,2],attachment_typ:2,attend:1,attribut:1,august:2,author:[1,2],author_list:2,auto:2,autom:1,automat:[1,3],avail:[1,2,3],avoid:1,base:[1,2],basic:1,been:[2,3],befor:[2,3],behavior:2,better:1,between:[1,2],bin:4,bio:2,blog:4,blogdetailview:2,blogindexview:2,blogmontharchiveview:2,blogpost:[1,2],blogpostarchivemixin:2,blogpostmixinview:2,blogpostqueryset:2,blogyeararchiveview:2,bodi:1,book:1,bootstrap:1,both:[2,3],bourbon:1,branch:4,brief:1,bring:1,broken:1,brows:1,bug:1,bugfix:1,build:[1,3,4],built:2,calendar:[1,2],call:2,campu:1,can:[1,2,3],card:[1,2],carousel:1,categor:1,categori:[1,2],cdh:[1,2],cdh_staff:2,cdhweb:[2,4],chang:[1,3,4],check:[1,2],choos:1,clean:[1,2],clean_field:2,cleanup:1,code:4,comma:2,command:4,committe:[1,2],common:2,commun:2,compat:1,complet:1,compressor:[3,4],confer:2,configur:[1,4],consist:1,constructor:2,consult:[1,3,4],contact:1,contain:[2,4],content:[2,3,4],content_model:2,context:[1,2],contribut:1,contributor:1,conveni:4,convent:4,convert:[1,2],copi:4,core:2,correspond:[2,3],cosponsor:3,cosponsorship:[1,3],creat:[1,2,3,4],createcasus:3,css:1,current:[1,2,3,4],current_gr:2,current_membership:2,current_posit:2,current_position_nonexec:2,current_titl:2,custom:[1,2,4],dai:2,data:[1,2,3],databas:[1,3,4],date:[1,2],date_join:2,date_list:2,daterang:2,datetim:2,davila:0,decid:1,defin:2,definit:4,delet:3,depart:2,department:2,depend:4,deploi:4,describ:1,descript:2,design:1,detail:[1,2],determin:1,dev:[1,4],develop:1,dict:2,differ:1,director:2,director_rol:2,directori:4,disabl:3,displai:[1,2],display:2,display_nam:2,display_url:2,distinguish:1,distribut:4,div:1,django:[1,2,3,4],doc:4,docket:4,document:1,doe:[1,2,4],doesn:1,doesnotexist:2,doing:2,don:1,downgrad:1,download:[1,2,4],draft:1,dumpdata:3,durat:2,earliest:2,easier:4,easili:1,edit:[1,2,3],editor:1,educ:2,effici:1,ellipsi:2,email:2,emb:3,embed:1,empti:[1,2],enabl:[2,3],end:[1,2],end_dat:2,ensur:[2,3],enter:[1,3],entiti:1,environ:4,error:[1,2],especi:1,etc:2,even:2,event:[3,4],eventdetailview:2,eventicalview:2,eventmixinview:2,eventqueryset:2,eventredirectview:2,eventsemesterarchiveview:2,eventsemesterd:2,eventtyp:2,everi:2,everyon:1,except:2,exclud:2,exec_memb:2,exec_member_titl:2,execlistview:2,execut:[1,2],executive_committe:2,exist:3,expiri:2,expiry_d:2,extern:2,extra:2,extra_context:2,face:1,faculti:[1,2,3],fail:3,fall:2,fals:2,favicon:1,featur:2,feed:[1,2],feed_typ:2,feedgener:2,fellow:2,fellowship:1,field:[1,2,3],file:[1,2,4],filebrowser_saf:1,filter:2,find:[1,2],first:[2,4],first_nam:2,fix:3,fixtur:4,flag:[1,2],flavor:4,flow:4,focus:1,follow:4,font:4,footer:1,for_us:2,form:[1,3],format:[1,2],from:[1,2,3],full_url:2,futur:2,gen_descript:2,gener:[2,4],get:[1,2],get_absolute_url:2,get_context_data:2,get_current_profil:2,get_date_list:2,get_dated_item:2,get_ical_url:2,get_object:2,get_past_profil:2,get_queryset:2,get_redirect_url:2,get_semester_date_list:2,git:4,github:[1,2,4],given:2,goal:1,going:1,googl:3,graduat:2,grant:[1,2,3,4],grant_year:2,grante:2,granttyp:2,graph:1,grappelli:2,grid:1,group:[1,2,3],handl:2,has:[1,2,3],has_upcoming_ev:2,have:[1,2,3,4],head:1,header:1,highlight:[1,2],hint:2,histori:1,home:1,homepag:1,honor:1,hook:2,hour:2,hover:1,how:1,href:1,html:[1,4],http:2,ical:[1,2],ical_ev:2,icalendar:2,icon:1,idea:1,imag:[1,2],implement:[1,2],import_datav1:3,improv:1,in_menu:2,in_sitemap:2,includ:[1,2,3,4],inclus:2,incorrect:1,incorrectli:1,index:4,indic:[1,2],info:[2,4],inform:[1,2,4],init:2,init_profile_from_ldap:2,initi:[3,4],insert:2,insid:1,instal:[1,3,4],instanc:2,instead:[1,2],institut:2,instut:2,interest:1,introductori:1,involv:1,is_act:2,is_curr:2,is_edit:2,is_staff:2,is_superus:2,is_virtu:2,issu:1,item:[2,3],item_author_link:2,item_author_nam:2,item_categori:2,item_descript:2,item_link:2,item_pubd:2,item_titl:2,item_updated:2,iter:2,its:[1,3],job:2,job_titl:2,join:[1,2],json:3,keep:1,keyboard:1,keyword:2,keywords_str:2,kind:[1,2],know:1,koeser:4,kwarg:2,label:2,land:[1,2],landingpag:2,larg:1,last:[1,2],last_login:2,last_modifi:2,last_nam:2,latest:1,latest_gr:2,ldap:2,ldapinfo:2,lead:2,learn:1,lectur:[1,2],level:1,like:1,line:[2,4],link:[1,2],linux:4,list:[1,2,3],live:1,load:[1,4],local:[2,3,4],local_set:4,locat:[1,2],log:4,logic:[1,2],login_requir:2,look:[1,2],lower:2,machin:3,maco:4,made:4,mai:[2,3,4],main:[1,2],make:[1,3,4],manag:[1,2,3],mani:[1,2],manual:[1,3],mariadb:[1,4],mark:2,marker:1,master:[1,4],match:[1,2,3],materi:1,media:1,member:[1,2],membership:[1,2],membershipqueryset:2,memebership:2,menu:1,messag:1,metadata:1,method:[2,4],mezzanin:[1,2,3,4],migrat:1,minor:1,mixin:2,mobil:1,model:4,modif:1,modifi:2,modul:4,month:[1,2],more:[1,4],most:[1,2,4],move:[1,3],multiown:2,multipl:[1,2],multipleobjectsreturn:2,must:[2,4],myself:1,mysql:[1,4],mysql_tzinfo_to_sql:4,name:[1,2,3],nav:1,navig:1,neat:1,need:[3,4],newslett:1,node:4,nodej:3,non:[1,2,3],non_field_error:2,none:2,not_curr:2,not_staff_or_postdoc:2,not_stud:2,note:4,now:1,npm:4,num_peopl:2,number:[1,2],numer:1,object:2,occur:2,offer:1,offic:1,office_loc:2,offici:2,old:1,older:1,onc:1,one:[1,2],onli:[1,2,4],onlin:4,open:[1,4],opengraph:1,option:2,order:[1,2,3],order_by_ev:2,order_by_newest_gr:2,order_by_posit:2,other:[2,3],out:2,over:1,overrid:[1,2],overridden:2,ownabl:2,owner:2,ownership:[2,4],pa11i:1,pad:1,page:[1,2,3,4],page_ptr:2,page_titl:2,pagin:1,parallel:3,parent:2,particular:2,pass:2,password:[2,4],past:[1,2,3],past_titl:2,path:1,path_to_data:3,pattern:2,peopl:[1,4],permiss:4,person:[1,2],personqueryset:2,pgra:[1,2],phone:1,phone_numb:2,photo:1,pillow:1,pip:4,place:2,png:1,popul:[1,2,3],posit:[1,2],post:[1,2],postdoc:[1,2,3],postdoc_titl:2,postdoctor:2,postgradu:[1,2],power:4,pre:3,presenc:1,prevent:1,preview:1,previou:[1,3],princeton:4,prioriti:1,process:3,product:4,profil:[2,3],profile_url:2,profiledetailview:2,profilelistview:2,profilemixinview:2,profilequeryset:2,profl:2,progress:[1,4],project:[3,4],project_manager_year:2,project_rol:2,projectdetailview:2,projectlistmixinview:2,projectlistview:2,projectmixinview:2,projectqueryset:2,projectresourc:2,prompt:4,proper:3,properti:2,provid:[1,2,4],pu_statu:2,publish:[1,2,4],publish_d:2,publishedmanag:2,publishedquerysetmixin:2,pull:4,python3:4,python:[3,4],queri:2,queryset:2,rais:2,rang:[1,2],rather:1,read:1,reader:1,readm:1,rebecca:4,receiv:1,recent:[1,2,4],recepi:2,recommend:4,recreat:3,redirect:2,refer:1,reflect:1,relat:[1,2],releas:[1,4],reload:1,remain:3,rememb:4,remot:1,remov:[1,2,3],renam:1,render:[0,1,2],render_to_respons:2,repeat:[1,3],report:1,repositori:4,republish:3,request:[1,2,3,4],requir:[1,2,4],research:[1,2],resourc:[1,3,4],resourcetyp:2,respect:1,respons:2,response_class:2,response_kwarg:2,restrict:2,restructur:1,result:2,rich:[1,3],richtext:2,richtextpag:3,right:4,robot:1,role:[1,2],root:4,rss:[1,2],rssblogpostfe:2,run:[3,4],sampl:4,schema:0,scholar:1,screen:1,script:1,search:[1,2,4],second:1,secondari:2,secret_kei:4,see:[1,4],self:2,semest:[1,2],sens:1,separ:[1,2],server:4,set:[1,2,3,4],setup:4,shadow:1,share:[1,4],shift:1,short_descript:2,short_nam:2,short_titl:2,short_url:2,shorter:2,should:[1,3,4],show:[1,2,3],show_affili:2,show_cdh_posit:2,show_ev:2,show_grant:2,show_job_titl:2,similar:[2,3],sinc:1,singl:2,site:[1,2,3],sitemap:1,sitemedia:4,sits_with_exec:2,skip:1,slowli:1,slug:[1,2,3],social:1,softwar:4,someon:2,sort:2,sourc:[2,4],space:3,speaker:[1,2],speakerlistview:2,special:2,specif:2,specifi:2,sphinx:[1,4],sponsor:[1,2],spring:2,staff:[1,2,3],staff_or_postdoc:2,staff_postdoc_gr:2,stafflistview:2,staffprojectlistview:2,standard:4,start:[1,2],start_dat:2,startword:1,statu:[1,2],store:3,student:[1,2],student_affili:2,student_pu_statu:2,student_titl:2,studentlistview:2,style:1,subclass:2,submenu:1,subscrib:1,summer:2,superus:2,support:[1,3],sure:[3,4],svg:1,system:2,tabl:2,tag:1,taglin:2,take:2,target:3,team:1,templat:[1,2,3],ten:2,term:2,test:1,text:[1,3],than:[1,2],thei:1,them:[1,4],thi:[1,2,3,4],thing:4,those:[1,2],three:3,through:2,thu:3,thumb:2,time:[1,2,4],timedelta:2,timezon:[1,4],tinymc:1,titl:[1,2,3],todai:2,top:[1,3],track:[1,2],transfer:4,travel:1,travers:1,truste:4,turn:3,tweak:1,twitter:[1,2],two:3,txt:[1,4],type:[1,2,3],typographi:1,under:[3,4],undergradu:2,understand:1,uniform:1,univers:4,unpublish:1,upcom:[1,2],upcomingeventsview:2,updat:[1,2,3,4],upgrad:1,upload:1,url:[1,2,3],urlconf:2,usabl:1,use:[1,2,4],used:2,user:[1,2,3,4],usernam:2,userresourc:2,uses:[2,4],using:[1,2,3,4],usr:4,util:[2,4],v10:3,valid:2,validationerror:2,valu:[1,2],version:[1,3],via:[1,3,4],view:[1,4],viewport:1,virtual:[1,2],virtualenv:4,visibl:1,visitor:1,visual:1,wai:[1,2],want:[1,2],web:1,webapp:2,websit:[1,2],website_url:2,were:[1,3],what:1,when:[1,2,4],where:[1,2],which:[1,2,4],who:1,whose:2,wide:2,window:4,without:[1,2],work:[1,2,3,4],working_group:2,workinggrouplistview:2,workshop:[1,2],written:[1,4],wrote:1,xml:1,year:[1,2],yet:1,you:4,your:4,zero:2,zone:4,zoneinfo:4},titles:["Architecture","CHANGELOG","Code Documentation","Deploy Notes","CDH website documentation"],titleterms:{"import":1,architectur:0,blog:[0,1,2],cdh:4,changelog:1,chore:1,code:2,content:1,databas:0,deploi:3,develop:4,document:[2,4],event:[0,1,2],featur:1,fix:1,indic:4,instruct:4,item:1,licens:4,model:2,note:3,other:1,overview:0,peopl:[0,2],profil:1,project:[0,1,2],resourc:[0,2],tabl:4,test:4,unit:4,view:2,websit:4}}) \ No newline at end of file +Search.setIndex({docnames:["architecture","changelog","codedocs","deploynotes","index"],envversion:{"sphinx.domains.c":2,"sphinx.domains.changeset":1,"sphinx.domains.citation":1,"sphinx.domains.cpp":3,"sphinx.domains.index":1,"sphinx.domains.javascript":2,"sphinx.domains.math":2,"sphinx.domains.python":2,"sphinx.domains.rst":2,"sphinx.domains.std":2,"sphinx.ext.intersphinx":1,"sphinx.ext.viewcode":1,sphinx:56},filenames:["architecture.rst","changelog.rst","codedocs.rst","deploynotes.rst","index.rst"],objects:{"cdhweb.blog":{models:[2,0,0,"-"],views:[2,0,0,"-"]},"cdhweb.blog.models":{Author:[2,1,1,""],BlogLinkPage:[2,1,1,""],BlogPost:[2,1,1,""],BlogPostQuerySet:[2,1,1,""],BlogPostTag:[2,1,1,""],MultiOwnable:[2,1,1,""],OldBlogPost:[2,1,1,""]},"cdhweb.blog.models.Author":{DoesNotExist:[2,2,1,""],MultipleObjectsReturned:[2,2,1,""]},"cdhweb.blog.models.BlogLinkPage":{DoesNotExist:[2,2,1,""],MultipleObjectsReturned:[2,2,1,""]},"cdhweb.blog.models.BlogPost":{DoesNotExist:[2,2,1,""],MultipleObjectsReturned:[2,2,1,""],author_list:[2,3,1,""],get_sitemap_urls:[2,3,1,""],get_url_parts:[2,3,1,""],short_description:[2,3,1,""],short_title:[2,3,1,""]},"cdhweb.blog.models.BlogPostQuerySet":{featured:[2,3,1,""],recent:[2,3,1,""]},"cdhweb.blog.models.BlogPostTag":{DoesNotExist:[2,2,1,""],MultipleObjectsReturned:[2,2,1,""]},"cdhweb.blog.models.MultiOwnable":{author_list:[2,3,1,""],is_editable:[2,3,1,""]},"cdhweb.blog.models.OldBlogPost":{DoesNotExist:[2,2,1,""],MultipleObjectsReturned:[2,2,1,""],get_absolute_url:[2,3,1,""],short_description:[2,3,1,""],short_title:[2,3,1,""]},"cdhweb.blog.views":{AtomBlogPostFeed:[2,1,1,""],BlogDetailView:[2,1,1,""],BlogIndexView:[2,1,1,""],BlogMonthArchiveView:[2,1,1,""],BlogPostArchiveMixin:[2,1,1,""],BlogPostMixinView:[2,1,1,""],BlogYearArchiveView:[2,1,1,""],RssBlogPostFeed:[2,1,1,""]},"cdhweb.blog.views.AtomBlogPostFeed":{feed_type:[2,4,1,""]},"cdhweb.blog.views.BlogDetailView":{get_context_data:[2,3,1,""]},"cdhweb.blog.views.BlogIndexView":{get_context_data:[2,3,1,""]},"cdhweb.blog.views.BlogMonthArchiveView":{get_context_data:[2,3,1,""]},"cdhweb.blog.views.BlogPostMixinView":{get_queryset:[2,3,1,""],model:[2,4,1,""]},"cdhweb.blog.views.BlogYearArchiveView":{get_context_data:[2,3,1,""]},"cdhweb.blog.views.RssBlogPostFeed":{item_author_email:[2,3,1,""],item_author_link:[2,3,1,""],item_author_name:[2,3,1,""],item_categories:[2,3,1,""],item_description:[2,3,1,""],item_link:[2,3,1,""],item_pubdate:[2,3,1,""],item_title:[2,3,1,""],item_updateddate:[2,3,1,""],items:[2,3,1,""]},"cdhweb.events":{models:[2,0,0,"-"],views:[2,0,0,"-"]},"cdhweb.events.models":{Event:[2,1,1,""],EventQuerySet:[2,1,1,""],EventTag:[2,1,1,""],EventType:[2,1,1,""],EventsLinkPage:[2,1,1,""],Location:[2,1,1,""],OldEvent:[2,1,1,""],Speaker:[2,1,1,""]},"cdhweb.events.models.Event":{DoesNotExist:[2,2,1,""],MultipleObjectsReturned:[2,2,1,""],clean:[2,3,1,""],duration:[2,3,1,""],get_ical_url:[2,3,1,""],get_url_parts:[2,3,1,""],ical_event:[2,3,1,""],is_virtual:[2,3,1,""],speaker_list:[2,3,1,""],when:[2,3,1,""]},"cdhweb.events.models.EventQuerySet":{recent:[2,3,1,""],upcoming:[2,3,1,""]},"cdhweb.events.models.EventTag":{DoesNotExist:[2,2,1,""],MultipleObjectsReturned:[2,2,1,""]},"cdhweb.events.models.EventType":{DoesNotExist:[2,2,1,""],MultipleObjectsReturned:[2,2,1,""]},"cdhweb.events.models.EventsLinkPage":{DoesNotExist:[2,2,1,""],MultipleObjectsReturned:[2,2,1,""]},"cdhweb.events.models.Location":{DoesNotExist:[2,2,1,""],MultipleObjectsReturned:[2,2,1,""],clean:[2,3,1,""],display_name:[2,3,1,""]},"cdhweb.events.models.OldEvent":{DoesNotExist:[2,2,1,""],MultipleObjectsReturned:[2,2,1,""],duration:[2,3,1,""],full_url:[2,3,1,""],get_absolute_url:[2,3,1,""],get_ical_url:[2,3,1,""],ical_event:[2,3,1,""],is_virtual:[2,3,1,""],when:[2,3,1,""]},"cdhweb.events.models.Speaker":{DoesNotExist:[2,2,1,""],MultipleObjectsReturned:[2,2,1,""]},"cdhweb.events.views":{EventDetailView:[2,1,1,""],EventIcalView:[2,1,1,""],EventMixinView:[2,1,1,""],EventSemesterArchiveView:[2,1,1,""],EventSemesterDates:[2,1,1,""],UpcomingEventsView:[2,1,1,""]},"cdhweb.events.views.EventDetailView":{get:[2,3,1,""],get_object:[2,3,1,""]},"cdhweb.events.views.EventIcalView":{get:[2,3,1,""]},"cdhweb.events.views.EventMixinView":{get_queryset:[2,3,1,""],model:[2,4,1,""]},"cdhweb.events.views.EventSemesterArchiveView":{get_context_data:[2,3,1,""],get_date_list:[2,3,1,""],get_dated_items:[2,3,1,""]},"cdhweb.events.views.EventSemesterDates":{get_semester:[2,3,1,""],get_semester_date_list:[2,3,1,""]},"cdhweb.events.views.UpcomingEventsView":{get_context_data:[2,3,1,""],last_modified:[2,3,1,""]},"cdhweb.people":{models:[2,0,0,"-"],views:[2,0,0,"-"]},"cdhweb.people.models":{OldProfile:[2,1,1,""],PeopleLandingPage:[2,1,1,""],Person:[2,1,1,""],PersonQuerySet:[2,1,1,""],PersonRelatedLink:[2,1,1,""],Position:[2,1,1,""],Profile:[2,1,1,""],Title:[2,1,1,""],init_person_from_ldap:[2,5,1,""]},"cdhweb.people.models.OldProfile":{DoesNotExist:[2,2,1,""],MultipleObjectsReturned:[2,2,1,""],get_absolute_url:[2,3,1,""]},"cdhweb.people.models.PeopleLandingPage":{DoesNotExist:[2,2,1,""],MultipleObjectsReturned:[2,2,1,""]},"cdhweb.people.models.Person":{DoesNotExist:[2,2,1,""],MultipleObjectsReturned:[2,2,1,""],cleanup_profile:[2,3,1,""],current_title:[2,3,1,""],latest_grant:[2,3,1,""],most_recent_title:[2,3,1,""],profile_url:[2,3,1,""],updated_at:[2,4,1,""]},"cdhweb.people.models.PersonQuerySet":{affiliates:[2,3,1,""],cdh_staff:[2,3,1,""],current:[2,3,1,""],current_grant:[2,3,1,""],current_position:[2,3,1,""],current_position_nonexec:[2,3,1,""],director_roles:[2,4,1,""],exec_member:[2,3,1,""],exec_member_title:[2,4,1,""],executive_committee:[2,3,1,""],grant_years:[2,3,1,""],not_students:[2,3,1,""],order_by_position:[2,3,1,""],postdoc_titles:[2,4,1,""],project_manager_years:[2,3,1,""],project_roles:[2,4,1,""],sits_with_exec:[2,3,1,""],student_affiliates:[2,3,1,""],student_pu_status:[2,4,1,""],student_titles:[2,4,1,""]},"cdhweb.people.models.PersonRelatedLink":{DoesNotExist:[2,2,1,""],MultipleObjectsReturned:[2,2,1,""]},"cdhweb.people.models.Position":{DoesNotExist:[2,2,1,""],MultipleObjectsReturned:[2,2,1,""]},"cdhweb.people.models.Profile":{DoesNotExist:[2,2,1,""],MultipleObjectsReturned:[2,2,1,""],clean:[2,3,1,""],get_context:[2,3,1,""]},"cdhweb.people.models.Title":{DoesNotExist:[2,2,1,""],MultipleObjectsReturned:[2,2,1,""],num_people:[2,3,1,""]},"cdhweb.people.views":{AffiliateListView:[2,1,1,""],ExecListView:[2,1,1,""],PersonListView:[2,1,1,""],StaffListView:[2,1,1,""],StudentListView:[2,1,1,""]},"cdhweb.people.views.AffiliateListView":{get_current:[2,3,1,""],get_queryset:[2,3,1,""]},"cdhweb.people.views.ExecListView":{get_context_data:[2,3,1,""],get_current:[2,3,1,""],get_queryset:[2,3,1,""]},"cdhweb.people.views.PersonListView":{current_title:[2,4,1,""],get_context_data:[2,3,1,""],get_current:[2,3,1,""],get_past:[2,3,1,""],get_queryset:[2,3,1,""],model:[2,4,1,""],page_title:[2,4,1,""],past_title:[2,4,1,""]},"cdhweb.people.views.StaffListView":{get_current:[2,3,1,""],get_queryset:[2,3,1,""]},"cdhweb.people.views.StudentListView":{get_past:[2,3,1,""],get_queryset:[2,3,1,""]},"cdhweb.projects":{models:[2,0,0,"-"],views:[2,0,0,"-"]},"cdhweb.projects.models":{Grant:[2,1,1,""],GrantType:[2,1,1,""],Membership:[2,1,1,""],OldProject:[2,1,1,""],Project:[2,1,1,""],ProjectQuerySet:[2,1,1,""],ProjectRelatedLink:[2,1,1,""],ProjectTag:[2,1,1,""],ProjectsLandingPage:[2,1,1,""],Role:[2,1,1,""]},"cdhweb.projects.models.Grant":{DoesNotExist:[2,2,1,""],MultipleObjectsReturned:[2,2,1,""]},"cdhweb.projects.models.GrantType":{DoesNotExist:[2,2,1,""],MultipleObjectsReturned:[2,2,1,""]},"cdhweb.projects.models.Membership":{DoesNotExist:[2,2,1,""],MultipleObjectsReturned:[2,2,1,""]},"cdhweb.projects.models.OldProject":{DoesNotExist:[2,2,1,""],MultipleObjectsReturned:[2,2,1,""],alums:[2,3,1,""],current_memberships:[2,3,1,""],get_absolute_url:[2,3,1,""],latest_grant:[2,3,1,""],website_url:[2,3,1,""]},"cdhweb.projects.models.Project":{DoesNotExist:[2,2,1,""],MultipleObjectsReturned:[2,2,1,""],alums:[2,3,1,""],current_memberships:[2,3,1,""],get_sitemap_urls:[2,3,1,""],latest_grant:[2,3,1,""],website_url:[2,3,1,""]},"cdhweb.projects.models.ProjectQuerySet":{current:[2,3,1,""],highlighted:[2,3,1,""],not_current:[2,3,1,""],not_staff_or_postdoc:[2,3,1,""],order_by_newest_grant:[2,3,1,""],staff_or_postdoc:[2,3,1,""],staff_postdoc_grants:[2,4,1,""],working_groups:[2,3,1,""]},"cdhweb.projects.models.ProjectRelatedLink":{DoesNotExist:[2,2,1,""],MultipleObjectsReturned:[2,2,1,""]},"cdhweb.projects.models.ProjectTag":{DoesNotExist:[2,2,1,""],MultipleObjectsReturned:[2,2,1,""]},"cdhweb.projects.models.ProjectsLandingPage":{DoesNotExist:[2,2,1,""],MultipleObjectsReturned:[2,2,1,""]},"cdhweb.projects.models.Role":{DoesNotExist:[2,2,1,""],MultipleObjectsReturned:[2,2,1,""]},"cdhweb.projects.views":{ProjectListView:[2,1,1,""],SponsoredProjectListView:[2,1,1,""],StaffProjectListView:[2,1,1,""],WorkingGroupListView:[2,1,1,""]},"cdhweb.projects.views.ProjectListView":{get_context_data:[2,3,1,""],get_current:[2,3,1,""],get_past:[2,3,1,""],get_queryset:[2,3,1,""],model:[2,4,1,""],page_title:[2,4,1,""],past_title:[2,4,1,""]},"cdhweb.projects.views.SponsoredProjectListView":{get_queryset:[2,3,1,""]},"cdhweb.projects.views.StaffProjectListView":{get_queryset:[2,3,1,""]},"cdhweb.projects.views.WorkingGroupListView":{get_context_data:[2,3,1,""],get_queryset:[2,3,1,""]},"cdhweb.resources":{models:[2,0,0,"-"]},"cdhweb.resources.models":{Attachment:[2,1,1,""],DateRange:[2,1,1,""],LandingPage:[2,1,1,""],PublishedQuerySetMixin:[2,1,1,""]},"cdhweb.resources.models.Attachment":{DoesNotExist:[2,2,1,""],MultipleObjectsReturned:[2,2,1,""]},"cdhweb.resources.models.DateRange":{clean_fields:[2,3,1,""],end_date:[2,4,1,""],is_current:[2,3,1,""],start_date:[2,4,1,""],years:[2,3,1,""]},"cdhweb.resources.models.LandingPage":{DoesNotExist:[2,2,1,""],MultipleObjectsReturned:[2,2,1,""]},"cdhweb.resources.models.PublishedQuerySetMixin":{published:[2,3,1,""]},cdhweb:{blog:[2,0,0,"-"],events:[2,0,0,"-"],people:[2,0,0,"-"],projects:[2,0,0,"-"],resources:[2,0,0,"-"]}},objnames:{"0":["py","module","Python module"],"1":["py","class","Python class"],"2":["py","exception","Python exception"],"3":["py","method","Python method"],"4":["py","attribute","Python attribute"],"5":["py","function","Python function"]},objtypes:{"0":"py:module","1":"py:class","2":"py:exception","3":"py:method","4":"py:attribute","5":"py:function"},terms:{"2014":2,"2019":4,"2634":4,"500":1,"abstract":2,"break":3,"case":[2,3],"class":2,"default":[2,3],"export":3,"function":1,"import":3,"new":[1,3],"null":1,"public":[1,2],"return":2,"static":2,"switch":1,"try":1,But:4,For:2,The:[2,3],Then:4,Use:[1,4],Uses:2,_meta_titl:2,_order:2,abl:1,about:1,absolut:2,access:1,accordingli:3,account:1,accur:1,across:1,action:[1,4],activ:[1,2,4],actual:1,add:[1,2,3,4],adding:[1,3],address:[1,2],adjust:1,admin:[1,3],advanced_top:4,advantag:1,affili:[1,2,3],affiliatelistview:2,after:[2,3],against:4,alia:2,all:[1,2,4],allow:[1,2],along:2,alt:1,alum:[1,2],alumni:[1,3],alwai:1,analyt:3,ani:[1,2,3],annot:2,ansibl:1,apach:[1,4],app:2,applic:[1,4],architectur:4,archiv:2,aren:[1,2],arg:2,argument:2,assign:3,assist:[1,2],associ:[1,2],assum:2,atom1fe:2,atom:2,atomblogpostfe:2,attach:[1,2],attachment_typ:2,attend:1,attribut:1,august:2,author:[1,2],author_list:2,auto:2,autom:1,automat:[1,3],avail:[0,1,3],avoid:1,backend:1,base:[1,2],basic:1,been:[2,3],befor:[1,2,3],behavior:2,better:1,between:[1,2],bin:4,bio:2,blog:4,blogdetailview:2,blogindexview:2,bloglinkpag:2,blogmontharchiveview:2,blogpost:[1,2],blogpostarchivemixin:2,blogpostmixinview:2,blogpostqueryset:2,blogposttag:2,blogyeararchiveview:2,bodi:1,book:1,bootstrap:1,both:[2,3],bourbon:1,branch:4,brief:1,bring:1,broken:1,brows:1,bug:1,bugfix:1,build:[1,3,4],built:2,calendar:[1,2],call:2,campu:1,can:[1,2,3],capabl:1,card:1,carousel:1,categor:1,categori:[1,2],cdh:[1,2],cdh_staff:2,cdhweb:[2,4],chang:[1,3,4],check:[1,2],choos:1,clean:[1,2],clean_field:2,cleanup:1,cleanup_profil:2,code:4,comma:2,command:4,commit:4,committe:[1,2],common:2,commun:2,compat:1,complet:1,compressor:[3,4],confer:2,configur:[1,4],consist:1,consult:[1,3,4],contact:1,contain:[2,4],content:[2,3,4],content_model:2,context:[1,2],continu:1,contribut:1,contributor:1,conveni:4,convent:4,convert:[1,2],copi:4,core:2,correspond:[2,3],cosponsor:3,cosponsorship:[1,3],creat:[1,2,3,4],createcasus:3,css:1,current:[1,2,3,4],current_gr:2,current_membership:2,current_posit:2,current_position_nonexec:2,current_titl:2,custom:[1,2,4],dai:2,data:[1,2,3],databas:[1,3,4],date:[1,2],date_list:2,daterang:2,datetim:2,davila:0,dbdoc:[0,4],dbml:4,decid:1,defin:2,definit:4,delet:[2,3],depart:2,depend:4,deploi:4,deploy:3,describ:1,descript:2,design:1,detail:[1,2],detect:4,determin:1,dev:[1,4],develop:1,diagram:[0,1,4],dict:2,differ:1,director:2,director_rol:2,directori:4,disabl:3,displai:[1,2],display_nam:2,distinguish:1,distribut:4,div:1,django:[1,2,3,4],doc:4,docket:4,document:[0,1],doe:[1,4],doesn:1,doesnotexist:2,doing:2,don:1,downgrad:1,download:[1,2,4],draft:1,due:1,dumpdata:3,durat:2,easier:4,easili:1,edit:[1,2,3],editor:1,educ:2,effici:1,ellipsi:2,email:2,emb:3,embed:1,empti:[1,2],enabl:[2,3],end:[1,2],end_dat:2,engin:1,ensur:[1,2,3],enter:[1,3],entiti:1,environ:4,error:[1,2],especi:1,even:2,event:[3,4],eventdetailview:2,eventicalview:2,eventmixinview:2,eventqueryset:2,eventsemesterarchiveview:2,eventsemesterd:2,eventslinkpag:2,eventtag:2,eventtyp:2,everi:[2,4],everyon:1,except:2,exclud:2,exec_memb:2,exec_member_titl:2,execlistview:2,execut:[1,2],executive_committe:2,exif:1,exist:[1,3],exodu:3,expir:2,expiri:2,expiry_d:2,extra:2,extra_context:2,face:1,faculti:[1,2,3],fail:3,fall:2,favicon:1,featur:[2,4],feature_detect:4,feed:[1,2],feed_typ:2,feedgener:2,fellow:2,fellowship:1,field:[1,2,3],file:[1,2,4],filebrowser_saf:1,filter:2,find:[1,2],first:[2,4],first_nam:2,fix:3,fixtur:4,flag:[1,2],flavor:4,flow:4,focus:1,follow:4,font:4,footer:1,for_us:2,form:[1,2,3],format:[1,2],from:[1,2,3],full_url:2,futur:2,gen_descript:2,gener:[2,4],get:[1,2],get_absolute_url:2,get_context:2,get_context_data:2,get_curr:2,get_date_list:2,get_dated_item:2,get_ical_url:2,get_object:2,get_past:2,get_queryset:2,get_semest:2,get_semester_date_list:2,get_sitemap_url:2,get_url_part:2,git:4,github:[1,4],goal:1,going:1,googl:3,graduat:2,grant:[1,2,3,4],grant_year:2,grante:2,granttyp:2,graph:1,grappelli:2,grid:1,group:[1,2,3],handl:2,handler:2,has:[1,2,3],have:[1,2,3,4],head:1,header:1,held:2,highlight:[1,2],hint:2,histori:1,hold:2,home:1,homepag:1,honor:1,hook:2,hour:2,hover:1,how:1,href:1,html:[1,4],http:4,ical:[1,2],ical_ev:2,icalendar:2,icon:1,ics:2,idea:1,imag:[1,2,4],implement:[1,2],import_datav1:3,improv:1,in_menu:2,in_sitemap:2,inact:1,includ:[1,2,3,4],inclus:2,incorrect:1,incorrectli:1,index:[1,4],indic:[1,2],info:4,inform:[1,2,4],init:2,init_person_from_ldap:2,initi:[3,4],insid:1,instal:[1,3,4],instanc:2,instead:1,institut:2,integr:1,interest:1,introductori:1,involv:1,is_curr:2,is_edit:2,is_staff:2,is_virtu:2,issu:1,item:[2,3],item_author_email:2,item_author_link:2,item_author_nam:2,item_categori:2,item_descript:2,item_link:2,item_pubd:2,item_titl:2,item_updatedd:2,iter:2,its:[1,3],job:2,job_titl:2,join:[1,2],json:3,just:1,keep:1,keyboard:1,keyword:2,keywords_str:2,kind:[1,2],know:1,koeser:4,kwarg:2,label:2,land:[1,2],landingpag:2,larg:1,last:[1,2],last_modifi:2,last_nam:2,latest:1,latest_gr:2,ldap:2,ldapinfo:2,lead:2,learn:1,lectur:[1,2],level:1,like:1,line:[2,4],link:[1,2],linux:4,list:[1,2,3],live:1,load:[1,4],local:[3,4],local_set:4,locat:[1,2],log:4,logic:[1,2],login_requir:2,look:[1,2],lower:2,machin:3,maco:4,made:4,mai:[2,3,4],main:[1,2,3,4],make:[1,3,4],manag:[1,2,3,4],mani:[1,2],manual:[1,3],mariadb:[1,4],mark:2,marker:1,master:1,match:[1,3],materi:1,media:1,member:[1,2],membership:[1,2],membershipqueryset:2,menu:1,messag:1,meta:1,metadata:1,method:[2,4],mezzanin:[1,2,3,4],migrat:[1,3],minor:1,mixin:2,mobil:1,model:4,moder:1,modif:1,modifi:2,modul:4,month:[1,2],more:[1,4],most:[1,2,4],most_recent_titl:2,move:[1,3],multiown:2,multipl:[1,2],multipleobjectsreturn:2,must:[2,4],myself:1,mysql:[1,4],mysql_tzinfo_to_sql:4,name:[1,2,3],nav:1,navig:[1,2],neat:1,necessari:4,need:[1,3,4],never:2,newest:2,newslett:1,next:2,node:4,nodej:3,non:[1,2,3],non_field_error:2,none:2,not_curr:2,not_staff_or_postdoc:2,not_stud:2,note:4,now:1,npm:4,npx:4,num_peopl:2,number:[1,2],numer:1,object:2,occur:2,offer:1,offic:1,office_loc:2,old:1,oldblogpost:2,older:[0,1],oldev:2,oldprofil:2,oldproject:2,onc:1,one:[1,2],onli:[1,2,4],onlin:4,open:[1,4],opencv:4,opengraph:1,option:2,order:[1,2,3],order_by_newest_gr:2,order_by_posit:2,organ:1,other:[2,3],otherwis:2,out:[2,3],over:1,overrid:[1,2],ownabl:2,owner:2,ownership:[2,4],pa11i:1,pad:1,page:[1,2,3,4],page_ptr:2,page_titl:2,pagin:1,parallel:3,parent:2,particular:2,password:4,past:[1,2,3],past_titl:2,path:1,path_to_data:3,peopl:[1,4],peoplelandingpag:2,permiss:[1,4],person:[1,2],personlistview:2,personqueryset:2,personrelatedlink:2,pgloader:3,pgra:[1,2],phone:1,phone_numb:2,photo:1,pillow:1,pip:4,place:2,png:1,popul:[1,2,3],posit:[1,2],post:[1,2],postdoc:[1,2,3],postdoc_titl:2,postdoctor:2,postgr:3,postgradu:[1,2],postgresql:[1,4],power:4,pre:3,presenc:1,prevent:1,preview:1,previou:[1,2,3],princeton:4,princetoncdh:4,priorit:2,prioriti:[1,2],process:3,product:4,profil:[2,3],profile_url:2,progress:[1,4],project:[3,4],project_manager_year:2,project_rol:2,projectlistview:2,projectqueryset:2,projectrelatedlink:2,projectslandingpag:2,projecttag:2,prompt:4,proper:3,properti:2,provid:[1,2,4],pu_statu:2,publish:[1,2,4],publish_d:2,publishedmanag:2,publishedquerysetmixin:2,pull:4,purpos:3,python3:4,python:[3,4],queri:2,queryset:2,rais:2,rang:[1,2],rather:1,read:1,reader:1,readm:1,rebecca:4,receiv:1,recent:[1,2,4],recommend:4,recreat:3,refer:1,reflect:1,relat:[1,2],relatedlink:2,relationship:2,releas:[1,4],reload:1,remain:3,rememb:4,remot:1,remov:[1,2,3],renam:1,render:[0,1],repeat:[1,3],report:1,repositori:4,republish:3,request:[1,2,3,4],requir:[1,2,4],research:[1,2],resourc:[1,3,4],respect:1,restrict:2,restructur:1,result:2,rewrit:1,rich:[1,3],richtext:2,richtextpag:3,right:4,robot:1,role:[1,2],root:4,rss:[1,2],rssblogpostfe:2,rule:1,run:[3,4],sampl:4,schema:0,scholar:1,screen:1,script:[1,3],search:[1,2,4],second:1,secondari:2,secret_kei:4,see:[1,4],self:2,semest:[1,2],sens:1,separ:[1,2],serv:2,server:4,set:[1,2,3,4],setup:4,shadow:1,share:[1,4],shift:1,short_descript:2,short_nam:2,short_titl:2,short_url:2,shorter:2,should:[1,3,4],show:[1,3],shown:2,similar:[2,3],sinc:1,site:[1,2,3],sitemap:[1,2],sitemedia:4,sits_with_exec:2,skip:1,slowli:1,slug:[1,2,3],social:1,softwar:4,some:1,someon:2,sort:2,sourc:[2,4],space:3,speaker:[1,2],speaker_list:2,special:2,specif:2,specifi:2,sphinx:[1,4],sponsor:[1,2],sponsoredprojectlistview:2,spring:2,stabl:4,staff:[1,2,3],staff_or_postdoc:2,staff_postdoc_gr:2,stafflistview:2,staffprojectlistview:2,standard:4,start:[1,2],start_dat:2,startword:1,statu:[1,2],store:3,string:2,student:[1,2],student_affili:2,student_pu_statu:2,student_titl:2,studentlistview:2,style:1,subclass:2,submenu:1,subscrib:1,subtyp:2,summer:2,superus:[1,2],support:[1,3],sure:[3,4],svg:1,system:[1,2],tabl:2,tag:[1,2],taglin:2,take:[1,2],target:3,team:1,templat:[1,2,3],ten:2,term:2,test:1,text:[1,3],than:[1,2],thei:1,them:[1,4],thi:[1,2,3,4],thing:4,those:1,three:3,through:2,thu:3,thumb:2,time:[1,2,4],timedelta:2,timestamp:2,timezon:[1,4],tinymc:1,titl:[1,2,3],todai:2,tool:3,top:[1,3],track:[1,2],transfer:4,travel:1,travers:1,travi:1,truste:4,turn:3,tweak:1,twice:1,twitter:1,two:3,txt:[1,4],type:[1,2,3],typographi:1,under:[3,4],undergradu:2,understand:1,uniform:1,uniqu:1,univers:4,unpublish:1,upcom:[1,2],upcomingeventsview:2,updat:[1,2,3,4],updated_at:2,upgrad:1,upload:1,url:[1,2,3],urlconf:2,usabl:1,use:[1,2,4],used:[2,3],user:[1,2,3,4],uses:[1,2,4],using:[1,2,3,4],usr:4,util:[2,4],v10:3,valid:2,validationerror:2,valu:[1,2],version:[0,1,3],via:[0,1,2,3,4],view:[1,4],viewport:1,virtual:[1,2],virtualenv:4,visibl:1,visitor:1,visual:1,wagtail:[1,2,3,4],wai:[1,2],want:1,web:[1,4],webapp:2,websit:[1,2],website_url:2,were:[1,3],what:1,when:[1,2,4],where:[1,2],which:[1,2,4],who:1,whose:2,wide:2,window:4,without:[1,2],work:[1,2,3,4],working_group:2,workinggrouplistview:2,workshop:[1,2],written:[1,4],wrote:1,xml:1,year:[1,2],yet:1,you:4,your:4,zero:2,zone:4,zoneinfo:4},titles:["Architecture","CHANGELOG","Code Documentation","Deploy Notes","CDH website documentation"],titleterms:{"import":1,architectur:0,blog:[0,1,2],cdh:4,changelog:1,chore:1,code:2,content:1,databas:0,deploi:3,develop:4,document:[2,4],event:[0,1,2],featur:1,fix:1,indic:4,instruct:4,item:1,licens:4,model:2,note:3,other:1,overview:0,peopl:[0,2],profil:1,project:[0,1,2],resourc:[0,2],tabl:4,test:4,unit:4,view:2,websit:4}}) \ No newline at end of file From 74e26a291ba326a48e808202170364f84bd3b3be Mon Sep 17 00:00:00 2001 From: Nick Budak Date: Tue, 30 Mar 2021 11:09:48 -0400 Subject: [PATCH 570/570] Lock python dependencies for v3.0 --- requirements.lock | 84 +++++++++++++++++++++++++++++++++++++---------- 1 file changed, 67 insertions(+), 17 deletions(-) diff --git a/requirements.lock b/requirements.lock index ce35b32df..013feefa5 100644 --- a/requirements.lock +++ b/requirements.lock @@ -1,50 +1,100 @@ +alabaster==0.7.12 +anyascii==0.1.7 attrdict==2.0.1 +attrs==20.3.0 +autopep8==1.5.6 +Babel==2.9.0 beautifulsoup4==4.9.3 -bleach==3.2.1 +bleach==3.3.0 certifi==2020.12.5 -chardet==4.0.0 -Django==2.2.17 -django-admin-sortable2==0.7.7 +chardet==3.0.4 +commonmark==0.9.1 +coverage==5.5 +Django==2.2.19 +django-admin-sortable2==0.7.8 django-appconf==1.0.4 django-apptemplates==1.5 django-cas-ng==4.1.1 +django-cogwheels==0.3 django-compressor==2.4 django-compressor-autoprefixer==0.1.0 -django-dbml==0.4.0 -django-debug-toolbar==3.1.1 -django-contrib-comments==2.0.0 +django-contrib-comments==2.1.0 +django-dbml==0.5.0 +django-debug-toolbar==3.2 +django-filter==2.4.0 django-fullurl==1.1 +django-modelcluster==5.1 django-taggit==1.3.0 +django-treebeard==4.5.1 +djangorestframework==3.12.2 +docutils==0.16 +draftjs-exporter==2.1.7 +et-xmlfile==1.0.1 filebrowser-safe==0.5.0 future==0.18.2 grappelli-safe==0.5.2 +html5lib==1.1 icalendar==4.0.7 idna==2.10 imagesize==1.2.0 -importlib-metadata==2.0.0 +importlib-metadata==3.7.3 iniconfig==1.1.1 -install==1.3.4 -Jinja2==2.11.2 -ldap3==2.8.1 -lxml==4.6.2 +Jinja2==2.11.3 +l18n==2020.6.1 +ldap3==2.9 +lxml==4.6.3 +MarkupSafe==1.1.1 Mezzanine==4.3.1 +mysqlclient==2.0.3 +numpy==1.19.5 oauthlib==3.1.0 -packaging==20.8 -Pillow==7.2.0 +opencv-python==4.5.1.48 +openpyxl==3.0.7 +packaging==20.9 +Pillow==8.1.2 +pluggy==0.13.1 psycopg2==2.8.6 pucas==0.7.0 +py==1.10.0 pyasn1==0.4.8 +pycodestyle==2.7.0 +Pygments==2.8.1 pyparsing==2.4.7 +pytest==6.2.2 +pytest-cov==2.11.1 +pytest-django==4.1.0 +pytest-ordering==0.6 +pytest-sugar==0.9.4 python-cas==1.5.0 python-dateutil==2.8.1 -pytz==2020.5 +pytz==2021.1 rcssmin==1.0.6 +recommonmark==0.7.1 requests==2.25.1 requests-oauthlib==1.3.0 rjsmin==1.1.0 six==1.15.0 -soupsieve==2.1 +snowballstemmer==2.1.0 +soupsieve==2.2.1 +Sphinx==3.5.3 +sphinxcontrib-applehelp==1.0.2 +sphinxcontrib-devhelp==1.0.2 +sphinxcontrib-htmlhelp==1.0.3 +sphinxcontrib-jsmath==1.0.1 +sphinxcontrib-qthelp==1.0.3 +sphinxcontrib-serializinghtml==1.1.4 sqlparse==0.4.1 +tablib==3.0.0 +termcolor==1.1.0 +toml==0.10.2 +typing-extensions==3.7.4.3 tzlocal==2.1 -urllib3==1.26.2 +urllib3==1.26.4 +wagtail==2.12.3 +wagtailmenus==3.0.2 webencodings==0.5.1 +Willow==1.4 +xlrd==2.0.1 +XlsxWriter==1.3.7 +xlwt==1.3.0 +zipp==3.4.1