-
Notifications
You must be signed in to change notification settings - Fork 479
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
Update K5 PL marketing page #57904
Merged
Merged
Update K5 PL marketing page #57904
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
386c0ad
create professional-learning/elementary.haml and redirect professiona…
kelbyhawn 08eae60
add views to share between k-5 and middle-high pl pages
kelbyhawn 8cb59f7
remove strings to move to a new PR
kelbyhawn e558867
Merge branch 'staging' into update-k-5-pl-page
kelbyhawn 9b256bd
delete new views
kelbyhawn 38a4525
add workshop and curriculum block sections
kelbyhawn 1df8cd0
add certificate list item to middle-high page
kelbyhawn 1422c2c
update map styles
kelbyhawn 59487fc
Merge branch 'staging' into update-k-5-pl-page
kelbyhawn 649a2d4
show programs and regional partner views
kelbyhawn File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -23,6 +23,7 @@ theme: responsive_full_width | |
%li=hoc_s(:pl_middle_high_top_list_01) | ||
%li=hoc_s(:pl_middle_high_top_list_02) | ||
%li=hoc_s(:pl_middle_high_top_list_03) | ||
%li=hoc_s("pl_page_k5.top_list_04") | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @dmcavoy added this re: this Figma comment |
||
%a.link-button{href: off_season_version ? "#subscribe-form" : "/educate/professional-learning/program-information"} | ||
=hoc_s(off_season_version ? :call_to_action_applications_get_notified : :call_to_action_apply_now) | ||
.video-wrapper.col-50 | ||
|
3 changes: 3 additions & 0 deletions
3
pegasus/sites.v3/code.org/public/images/action-blocks/action-block-csf.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions
3
pegasus/sites.v3/code.org/public/images/action-blocks/action-block-poetry.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions
1
pegasus/sites.v3/code.org/public/professional-development-workshops.redirect
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
/professional-learning/elementary |
147 changes: 0 additions & 147 deletions
147
pegasus/sites.v3/code.org/public/professional-development-workshops/index.md.erb
This file was deleted.
Oops, something went wrong.
72 changes: 72 additions & 0 deletions
72
pegasus/sites.v3/code.org/public/professional-learning/elementary.haml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,72 @@ | ||
--- | ||
title: K-5 Professional Learning Workshops | ||
theme: responsive_full_width | ||
--- | ||
|
||
- button_url = "#workshops-map" | ||
- button_string = hoc_s("pl_page_k5.button") | ||
|
||
%link{href: "/css/generated/design-system-pegasus.css", rel: "stylesheet"} | ||
|
||
%section | ||
.wrapper | ||
%h1=hoc_s("pl_page_k5.heading") | ||
.grid-container.two-col.justify-space-between.align-items-start.gap-2 | ||
.text-wrapper | ||
%p=hoc_s("pl_page_k5.desc_01") | ||
%p.body-three.wrap-pretty | ||
%strong=hoc_s("pl_page_k5.desc_02") | ||
%ul | ||
%li=hoc_s("pl_page_k5.top_list_01") | ||
%li=hoc_s("pl_page_k5.top_list_02") | ||
%li=hoc_s("pl_page_k5.top_list_03") | ||
%li=hoc_s("pl_page_k5.top_list_04") | ||
%a.link-button{href: button_url} | ||
=button_string | ||
%figure | ||
%img.rounded-corners{src: "/images/self-paced-pl-tile-csf.png", alt: "", style: "width: 100%; margin-block: 0.5rem 0"} | ||
|
||
%section.bg-neutral-light | ||
.wrapper.centered | ||
%h2=hoc_s("pl_page_k5.workshops.heading") | ||
%p.wrap-pretty | ||
=hoc_s("pl_page_k5.workshops.desc") | ||
= view :"professional_learning/k_5_workshop_blocks" | ||
%a.link-button.add-margin-top{href: button_url} | ||
=button_string | ||
|
||
%section.quote.bg-neutral-dark | ||
.wrapper | ||
%div.quotes-wrapper | ||
%p.quote-text.large | ||
=hoc_s("pl_page_k5.quote.text") | ||
%p.no-margin-bottom | ||
Daphne Wright | ||
%span • | ||
=hoc_s("pl_page_k5.quote.byline") | ||
|
||
%section#workshops-map | ||
.wrapper | ||
%h2=hoc_s("pl_page_k5.workshops_map.heading") | ||
%p=hoc_s("pl_page_k5.workshops_map.desc") | ||
= view :workshop_search | ||
|
||
%section.bg-neutral-light | ||
.wrapper.centered | ||
%h2=hoc_s("pl_page_k5.curriculum.heading") | ||
%p=hoc_s("pl_page_k5.curriculum.desc") | ||
= view :"professional_learning/k_5_curriculum_blocks" | ||
%a.link-button.secondary.add-margin-top{href: CDO.studio_url("/catalog?grade=grade_1&grade=grade_2&grade=grade_3&grade=grade_4&grade=grade_5&grade=kindergarten")} | ||
=hoc_s("pl_page_k5.curriculum.button") | ||
|
||
%section | ||
.wrapper | ||
= view :"professional_learning/additional_programs", heading: hoc_s("pl_page_k5.additional_offerings.heading"), desc: hoc_s("pl_page_k5.additional_offerings.desc"), middle_high: false | ||
|
||
= view :section_divider_line | ||
|
||
%section | ||
.wrapper | ||
= view :"professional_learning/regional_partners_questions" | ||
|
||
= view :analytics_event_log_helper, event_name: AnalyticsConstants::ELEMENTARY_SCHOOL_PL_PAGE_VISITED_EVENT |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
34 changes: 34 additions & 0 deletions
34
pegasus/sites.v3/code.org/views/professional_learning/k_5_curriculum_blocks.haml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
:ruby | ||
block_items = [ | ||
{ | ||
overline: hoc_s("pl_page_k5.curriculum.csf.overline"), | ||
title: hoc_s("pl_page_k5.curriculum.csf.title"), | ||
image: "/images/action-blocks/action-block-csf.png", | ||
desc: hoc_s("pl_page_k5.curriculum.csf.desc"), | ||
url: "/csf", | ||
button_label: hoc_s("pl_page_k5.curriculum.csf.button") | ||
}, | ||
{ | ||
overline: hoc_s("pl_page_k5.curriculum.csc.overline"), | ||
title: hoc_s("pl_page_k5.curriculum.csc.title"), | ||
image: "/images/action-blocks/action-block-poetry.png", | ||
desc: hoc_s("pl_page_k5.curriculum.csc.desc"), | ||
url: "/csc", | ||
button_label: hoc_s("pl_page_k5.curriculum.csc.button") | ||
}, | ||
] | ||
|
||
.action-block__wrapper.action-block__wrapper--two-col | ||
- block_items.each do |block_item| | ||
.action-block.action-block--one-col.flex-space-between.white | ||
.content-wrapper | ||
%p.overline | ||
= block_item[:overline] | ||
%h3 | ||
= block_item[:title] | ||
%img{src: "#{block_item[:image]}", alt: ""} | ||
%p | ||
= block_item[:desc] | ||
.content-footer | ||
%a.link-button{href: "#{block_item[:url]}"} | ||
= block_item[:button_label] |
24 changes: 24 additions & 0 deletions
24
pegasus/sites.v3/code.org/views/professional_learning/k_5_workshop_blocks.haml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
:ruby | ||
block_items = [ | ||
{ | ||
overline: hoc_s("pl_page_k5.workshops.intro.overline"), | ||
title: hoc_s("pl_page_k5.workshops.intro.title"), | ||
desc: hoc_s("pl_page_k5.workshops.intro.desc"), | ||
}, | ||
{ | ||
overline: hoc_s("pl_page_k5.workshops.deep_dive.overline"), | ||
title: hoc_s("pl_page_k5.workshops.deep_dive.title"), | ||
desc: hoc_s("pl_page_k5.workshops.deep_dive.desc"), | ||
}, | ||
] | ||
|
||
.action-block__wrapper.action-block__wrapper--two-col | ||
- block_items.each do |block_item| | ||
.action-block.action-block--one-col.flex-space-between.white | ||
.content-wrapper | ||
%p.overline | ||
= block_item[:overline] | ||
%h3 | ||
= block_item[:title] | ||
%p | ||
= block_item[:desc] |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
can you add a comment as to why
!important
is needed here?Also, more broadly, sorry for being a stickler here -- as you know, this is an anti-pattern and I'd like to understand why we need to do this. I completely believe that it's needed, just want to know why :)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes definitely! I'll do it in a followup, but the short answer is that this can be used as a utility class that will override existing margin-top on any element.