Skip to content

Commit

Permalink
Merge pull request #401 from middlebury/course-list-component
Browse files Browse the repository at this point in the history 
Fixed course list on the faculty profile detail page
  • Loading branch information
@imcbride
imcbride authored Sep 1, 2021
2 parents c1aec74 + cac13ef commit deda9e2
Show file tree
Hide file tree
Showing 3 changed files with 132 additions and 120 deletions.
16 changes: 8 additions & 8 deletions src/templates/paragraphs/course-list.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,14 @@
] %}

<section class="section paragraph--course-list" data-digest-content>
<div class="section__header">
<h2 class="section__title">
Courses Title
</h2>
<p class="section__text">
These are the courses I teach.
</p>
</div>
<div class="section__header">
<h2 class="section__title">
{{ course_title }}
</h2>
<p class="section__text">
These are the courses I teach.
</p>
</div>
{% include 'partials/accordion.twig' with {
items: course_items,
course_list: true,
Expand Down
18 changes: 10 additions & 8 deletions src/templates/partials/basic-content.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,19 @@
<div class="paragraph--text typography" data-digest-content>
<h2>
There&rsquo;s a heading after intro. 360&deg; degrees. You’ve got
questions. We’ve "got“ answers!
questions. We’ve "got“ answers!
</h2>
<p>
Lorem ipsum dolor sit, amet consectetur adipisicing elit. Possimus facilis
consectetur adipisci minus libero natus assumenda pariatur, architecto
nisi sed rerum ad rem recusandae? Sapiente blanditiis consectetur maxime
incidunt voluptatibus?
consectetur adipisci minus libero natus assumenda pariatur, architecto
nisi sed rerum ad rem recusandae? Sapiente blanditiis consectetur maxime
incidunt voluptatibus?
</p>
<p>
Sapiente cumque, quibusdam illo eaque itaque deleniti hic quos
perspiciatis aut, nostrum at aspernatur deserunt dolor delectus officia
odio aperiam atque eligendi, sit ab tempora expedita quod accusantium
autem. Repellat!
perspiciatis aut, nostrum at aspernatur deserunt dolor delectus officia
odio aperiam atque eligendi, sit ab tempora expedita quod accusantium
autem. Repellat!
</p>
</div>

Expand Down Expand Up @@ -66,7 +66,9 @@

{% include 'paragraphs/faq.twig' %}

{% include 'paragraphs/course-list.twig' %}
{% include 'paragraphs/course-list.twig' with {
course_title: 'Course Title'
} %}

{% include 'paragraphs/text.twig' %}

Expand Down
218 changes: 114 additions & 104 deletions src/templates/partials/profile-detail.twig
View file
Original file line number Diff line number Diff line change
@@ -1,112 +1,122 @@
{% embed 'partials/sidebar-layout.twig' %}
{% block nav %}
{% block nav %}

<div class="row">
<div class="row">

<div class="col-sm-5 col-lg-12 mb-3 mb-md-0 mb-lg-4">
{% include 'partials/img.twig' with {
<div class="col-sm-5 col-lg-12 mb-3 mb-md-0 mb-lg-4">
{% include 'partials/img.twig' with {
name: 'profile_detail'
} %}
</div>

<div class="col-sm-7 col-lg-12">
<dl>
<dt class="text-bold">Office</dt>
<dd class="mb-3">E6-364</dd>
<dt class="text-bold">Tel</dt>
<dd class="mb-3"><a href="tel:6173247535" class="link-underline">617-324-7535</a></dd>
<dt class="text-bold">Email</dt>
<dd class="mb-3"><a href="mailto:[email protected]" class="link-underline">blevinger<wbr>@middlebury.edu</a></dd>
<dt class="text-bold">Office Hours</dt>
<dd class="mb-3">Tuesdays 3-4pm<br>Thursdays 11am-12pm</dd>
<dt class="text-bold sr-only">CV</dt>
<dd class="mb-3"><a href="#" class="link-underline">Download CV</a></dd>
<dt class="text-bold sr-only">Elsewhere</dt>
<dd class="mb-3">
{% include 'partials/social-links.twig' with {
</div>

<div class="col-sm-7 col-lg-12">
<dl>
<dt class="text-bold">Office</dt>
<dd class="mb-3">E6-364</dd>
<dt class="text-bold">Tel</dt>
<dd class="mb-3">
<a href="tel:6173247535" class="link-underline">617-324-7535</a>
</dd>
<dt class="text-bold">Email</dt>
<dd class="mb-3">
<a href="mailto:[email protected]" class="link-underline">blevinger<wbr>@middlebury.edu</a>
</dd>
<dt class="text-bold">Office Hours</dt>
<dd class="mb-3">Tuesdays 3-4pm<br>Thursdays 11am-12pm</dd>
<dt class="text-bold sr-only">CV</dt>
<dd class="mb-3">
<a href="#" class="link-underline">Download CV</a>
</dd>
<dt class="text-bold sr-only">Elsewhere</dt>
<dd class="mb-3">
{% include 'partials/social-links.twig' with {
items: social_links
} %}
</dd>
</dl>
</div>

</div>

{% endblock %}
{% block content %}

<div class="typography mb-7 mb-lg-9">
<p>Pellentesque nibh felis, eleifend id, commodo in, interdum vitae, leo. Praesent eu elit. Ut eu ligula. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Maecenas elementum augue nec nisl. Proinauctor lorem at nibh. Curabitur nulla purus, feugiat id, elementum in, lobortis quis, pede. Vivamus sodales adipiscing sapien. Vestibulum posuere nulla eget wisi.</p>
<p>Integer volutpat ligula eget enim. Suspendisse vitae arcu. Pellentesque nibh felis, eleifend id, commodo in, interdum vitae, leo. Praesent eu elit. Ut eu ligula. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Maecenas elementum augue nec nisl. Proin auctor lorem at nibh. Curabitur nulla purus, feugiat id, elementum in, lobortis quis, pede. Vivamus sodales adipiscing sapien. Vestibulum posuere nulla eget wisi.</p>
</div>

<section class="section" aria-labelledby="midd-profile-section-courses-label">
<h2 class="section__title" id="midd-profile-section-courses-label">Courses Taught</h2>
{% include 'partials/course-list.twig' %}
</section>

<section class="section" aria-labelledby="midd-profile-section-interests-label">
<h2 class="section__title" id="midd-profile-section-interests-label">Areas of Interest</h2>
<div class="typography">
<ul>
<li>Lorem ipsum dolor sit amet</li>
<li>Nihil amet dolore ea reprehenderit voluptate beatae quod</li>
</ul>
</div>
</section>

<section class="section" aria-labelledby="midd-profile-section-centers-label">
<h2 class="section__title" id="midd-profile-section-centers-label">Research Centers</h2>
<div class="typography">
<ul>
<li><a href="#">Lorem ipsum dolor sit amet</a></li>
<li><a href="#">Nihil amet dolore ea reprehenderit voluptate beatae quod</a></li>
</ul>
</div>
</section>

<section class="section" aria-labelledby="midd-profile-section-degrees-label">
<h2 class="section__title" id="midd-profile-section-degrees-label">Academic Degrees</h2>
<div class="typography">
<ul>
<li>Lorem ipsum dolor sit amet</li>
<li>Nihil amet dolore ea reprehenderit voluptate beatae quod</li>
</ul>
</div>
</section>

<section class="section" aria-labelledby="midd-profile-section-pubs-label">
<h2 class="section__title" id="midd-profile-section-pubs-label">Latest Publications</h2>

<div class="typography">
<h3><a href="#">Islam, Islamism, and Politics in Eurasia Report</a></h3>
<p>Pellentesque nibh felis, eleifend id, commodo in, interdum vitae, leo. Praesent eu elit. Ut eu ligula. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos.</p>
</div>
</section>

<section class="section" aria-labelledby="midd-profile-section-events-label">
<h2 class="section__title" id="midd-profile-section-events-label">Upcoming Events</h2>

<ol class="list list--dividers list--md">
<li class="list__item">
{% include 'partials/event-teaser.twig' %}
</li>
</ol>
</section>

<section class="section" aria-labelledby="midd-profile-section-news-label">
<h2 class="section__title" id="midd-profile-section-news-label">News Feed</h2>

<ul class="list list--dividers list--md">
{% for i in 0..1 %}
<li class="list__item">
{% include 'partials/story.twig' with { id: i } %}
</li>
{% endfor %}
</ul>

</section>

{% endblock %}
</dd>
</dl>
</div>

</div>

{% endblock %}
{% block content %}

<div class="typography mb-7 mb-lg-9">
<p>Pellentesque nibh felis, eleifend id, commodo in, interdum vitae, leo. Praesent eu elit. Ut eu ligula. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Maecenas elementum augue nec nisl. Proinauctor lorem at nibh. Curabitur nulla purus, feugiat id, elementum in, lobortis quis, pede. Vivamus sodales adipiscing sapien. Vestibulum posuere nulla eget wisi.</p>
<p>Integer volutpat ligula eget enim. Suspendisse vitae arcu. Pellentesque nibh felis, eleifend id, commodo in, interdum vitae, leo. Praesent eu elit. Ut eu ligula. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Maecenas elementum augue nec nisl. Proin auctor lorem at nibh. Curabitur nulla purus, feugiat id, elementum in, lobortis quis, pede. Vivamus sodales adipiscing sapien. Vestibulum posuere nulla eget wisi.</p>
</div>

<section
class="section" aria-labelledby="midd-profile-section-courses-label">
<!-- <h2 class="section__title" id="midd-profile-section-courses-label">Courses Taught</h2> -->
{% include 'paragraphs/course-list.twig' with {
course_title: 'Courses Taught'
} %}
</section>

<section class="section" aria-labelledby="midd-profile-section-interests-label">
<h2 class="section__title" id="midd-profile-section-interests-label">Areas of Interest</h2>
<div class="typography">
<ul>
<li>Lorem ipsum dolor sit amet</li>
<li>Nihil amet dolore ea reprehenderit voluptate beatae quod</li>
</ul>
</div>
</section>

<section class="section" aria-labelledby="midd-profile-section-centers-label">
<h2 class="section__title" id="midd-profile-section-centers-label">Research Centers</h2>
<div class="typography">
<ul>
<li><a href="#">Lorem ipsum dolor sit amet</a></li>
<li><a href="#">Nihil amet dolore ea reprehenderit voluptate beatae quod</a></li>
</ul>
</div>
</section>

<section class="section" aria-labelledby="midd-profile-section-degrees-label">
<h2 class="section__title" id="midd-profile-section-degrees-label">Academic Degrees</h2>
<div class="typography">
<ul>
<li>Lorem ipsum dolor sit amet</li>
<li>Nihil amet dolore ea reprehenderit voluptate beatae quod</li>
</ul>
</div>
</section>

<section class="section" aria-labelledby="midd-profile-section-pubs-label">
<h2 class="section__title" id="midd-profile-section-pubs-label">Latest Publications</h2>

<div class="typography">
<h3>
<a href="#">Islam, Islamism, and Politics in Eurasia Report</a>
</h3>
<p>Pellentesque nibh felis, eleifend id, commodo in, interdum vitae, leo. Praesent eu elit. Ut eu ligula. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos.</p>
</div>
</section>

<section class="section" aria-labelledby="midd-profile-section-events-label">
<h2 class="section__title" id="midd-profile-section-events-label">Upcoming Events</h2>

<ol class="list list--dividers list--md">
<li class="list__item">
{% include 'partials/event-teaser.twig' %}
</li>
</ol>
</section>

<section class="section" aria-labelledby="midd-profile-section-news-label">
<h2 class="section__title" id="midd-profile-section-news-label">News Feed</h2>

<ul class="list list--dividers list--md">
{% for i in 0..1 %}
<li class="list__item">
{% include 'partials/story.twig' with { id: i } %}
</li>
{% endfor %}
</ul>

</section>

{% endblock %}
{% endembed %}

0 comments on commit deda9e2

Please sign in to comment.