Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 1.109.0 #1377

Closed
wants to merge 5 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions RELEASE.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
Release Notes
=============

Version 1.109.0
---------------

- fix: rendering issues for migrated content (#1371)
- Add back content class in course content (#1374)
- Video pages layout width-fix (#1369)

Version 1.108.0 (Released March 20, 2024)
---------------

Expand Down
16 changes: 9 additions & 7 deletions base-offline/layouts/partials/video.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,15 @@
<div class="description">
{{ .Content }}
</div>
{{ partial "video_player.html" (dict "context" $context "youtubeKey" $youtubeKey "archiveUrl" $archiveUrl "downloadLink" $downloadLink "startTime" $startTime "endTime" $endTime) }}
<div class="video-player-wrapper">
{{ partial "video_player.html" (dict "context" $context "youtubeKey" $youtubeKey "archiveUrl" $archiveUrl "downloadLink" $downloadLink "startTime" $startTime "endTime" $endTime) }}

{{ if $relatedResourses }}
{{ partial "video_expandable_tab.html" (dict "context" $context "tabClass" "related-resource" "tabTitle" "Related Resources" "tabContent" $relatedResourses) }}
{{ end }}
{{ if $relatedResourses }}
{{ partial "video_expandable_tab.html" (dict "context" $context "tabClass" "related-resource" "tabTitle" "Related Resources" "tabContent" $relatedResourses) }}
{{ end }}

{{ if and $optionalTabTitle $optionalTabContent }}
{{ partial "video_expandable_tab.html" (dict "context" $context "tabClass" "optional-tab" "tabTitle" $optionalTabTitle "tabContent" $optionalTabContent) }}
{{end}}
{{ if and $optionalTabTitle $optionalTabContent }}
{{ partial "video_expandable_tab.html" (dict "context" $context "tabClass" "optional-tab" "tabTitle" $optionalTabTitle "tabContent" $optionalTabContent) }}
{{end}}
</div>
</div>
4 changes: 0 additions & 4 deletions base-theme/assets/css/main.scss
Original file line number Diff line number Diff line change
Expand Up @@ -349,10 +349,6 @@ article.content {
#course-title {
border-bottom: 1px solid $medium-gray;
}

@include media-breakpoint-down(xs) {
padding-right: 15px;
}
}

.download-file {
Expand Down
2 changes: 1 addition & 1 deletion base-theme/assets/css/variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ $resource-video-thumbnail-color: #494949;
$resource-file-thumbnail-color: #0851bb;

// video
$video-section-max-width: 100vh;
$video-player-max-width: 100vh;
$video-tab-content-color: rgba(51, 51, 51, 0.87);
$video-tab-title-color: rgba(255, 255, 255, 0.87);
$transcript-hover-background-color: #e1e1e1;
Expand Down
2 changes: 1 addition & 1 deletion base-theme/layouts/partials/external_resource_link.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{{- $text := default .title .text | htmlEscape | page.RenderString -}}
{{- $text := default .title .text -}}
{{- $href := default "" .external_url -}}
{{- $isBroken := default false .is_broken -}}
{{- $backupUrl := default "" .backup_url -}}
Expand Down
26 changes: 14 additions & 12 deletions base-theme/layouts/partials/video.html
Original file line number Diff line number Diff line change
Expand Up @@ -27,18 +27,20 @@
<div class="description">
{{ .Content }}
</div>
{{ partial "video_player.html" (dict "context" $context "youtubeKey" $youtubeKey "archiveUrl" $archiveUrl "captionsLocation" $captionsLocation "startTime" $startTime "endTime" $endTime "downloadLink" $downloadLink "transcriptLink" $transcriptPdfLocation)}}
{{ if $transcriptPdfLocation }}
{{ partial "video_expandable_tab.html" (dict "context" $context "tabClass" "transcript" "tabTitle" "Transcript" "downloadLink" $downloadLink "transcriptLink" $transcriptPdfLocation) }}
{{ else }}
{{ partial "video_expandable_tab.html" (dict "context" $context "tabClass" "" "tabTitle" "" "downloadLink" $downloadLink "transcriptLink" $transcriptPdfLocation) }}
{{end}}
<div class="video-player-wrapper">
{{ partial "video_player.html" (dict "context" $context "youtubeKey" $youtubeKey "archiveUrl" $archiveUrl "captionsLocation" $captionsLocation "startTime" $startTime "endTime" $endTime "downloadLink" $downloadLink "transcriptLink" $transcriptPdfLocation)}}
{{ if $transcriptPdfLocation }}
{{ partial "video_expandable_tab.html" (dict "context" $context "tabClass" "transcript" "tabTitle" "Transcript" "downloadLink" $downloadLink "transcriptLink" $transcriptPdfLocation) }}
{{ else }}
{{ partial "video_expandable_tab.html" (dict "context" $context "tabClass" "" "tabTitle" "" "downloadLink" $downloadLink "transcriptLink" $transcriptPdfLocation) }}
{{end}}

{{ if $relatedResourses }}
{{ partial "video_expandable_tab.html" (dict "context" $context "tabClass" "related-resource" "tabTitle" "Related Resources" "tabContent" $relatedResourses) }}
{{ end }}
{{ if $relatedResourses }}
{{ partial "video_expandable_tab.html" (dict "context" $context "tabClass" "related-resource" "tabTitle" "Related Resources" "tabContent" $relatedResourses) }}
{{ end }}

{{ if and $optionalTabTitle $optionalTabContent }}
{{ partial "video_expandable_tab.html" (dict "context" $context "tabClass" "optional-tab" "tabTitle" $optionalTabTitle "tabContent" $optionalTabContent) }}
{{end}}
{{ if and $optionalTabTitle $optionalTabContent }}
{{ partial "video_expandable_tab.html" (dict "context" $context "tabClass" "optional-tab" "tabTitle" $optionalTabTitle "tabContent" $optionalTabContent) }}
{{end}}
</div>
</div>
2 changes: 1 addition & 1 deletion base-theme/layouts/partials/video_embed.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
{{ $downloadLink = partial "resource_url.html" (dict "context" $context "url" $downloadLink) }}
{{ end }}

<div class="video-embed">
<div class="video-embed video-player-wrapper">
{{ partial "video_player.html" (dict "context" $context "youtubeKey" $youtubeKey "archiveUrl" $archiveUrl "captionsLocation" $captionsLocation "startTime" $startTime "endTime" $endTime "downloadLink" $downloadLink) }}
{{ range where site.Pages "Params.uid" $uid }}
{{ $resourceUrl := partial "page_url.html" (dict "context" $context "url" .Permalink) }}
Expand Down
5 changes: 4 additions & 1 deletion base-theme/layouts/shortcodes/resource_link.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@
{{- $title := index .Params 1 | safeHTML -}}
{{- $anchor_id := index .Params 2 | default ""}}
{{- range where $.Site.Pages "Params.uid" $uuid -}}
{{- if eq .Params.content_type "external-resource" -}}
{{- if eq .Params.content_type "external-resource" -}}
{{- if findRE "^(?:http|https|ftp|mailto)" $title -}}
{{- $title = (replace $title "/" "\\/") -}}
{{- end -}}
{{- partial "external_resource_link"
(merge .Params (dict "text" $title))
-}}
Expand Down
3 changes: 3 additions & 0 deletions course-v2/assets/css/instructor-insights.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
@import "../../../base-theme/assets/css/variables.scss";
#course-content-section {
margin-top: 20px;
padding-right: 1.5rem;

p {
margin-bottom: 1.25rem;
}
Expand Down
6 changes: 4 additions & 2 deletions course-v2/assets/css/video.scss
Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,14 @@
}

.video-embed {
max-width: $video-section-max-width;
margin-bottom: 15px;
}

.video-player-wrapper {
max-width: $video-player-max-width;
}

.video-page {
max-width: $video-section-max-width;
margin-bottom: 15px;

.video-container {
Expand Down
2 changes: 1 addition & 1 deletion course-v2/layouts/partials/course_description.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ <h4 class="course-detail-title">
</h4>
{{ if $shouldCollapseDescription }}
<div id="collapsed-description" class="description">
{{- .context.RenderString (truncate 320 $courseData.course_description) -}}
{{- truncate 320 (.context.RenderString $courseData.course_description) -}}
{{- partial "link_button.html" (dict "text" "Show more" "id" "expand-description") -}}
</div>
<div id="expanded-description" class="description d-none">
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ocw-hugo-themes",
"version": "1.108.0",
"version": "1.109.0",
"description": "A Hugo theme for building OCW websites",
"repository": "mitodl/ocw-hugo-themes",
"main": "base-theme/assets/index.js",
Expand Down
Loading