-
Notifications
You must be signed in to change notification settings - Fork 12
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #430 from epfl-idevelop/feature/people-detail
Amélioration de la page 'People detail'
- Loading branch information
Showing
23 changed files
with
537 additions
and
115 deletions.
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
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,18 @@ | ||
| <picture> | ||
| <source | ||
| media="(min-width: 1140px)" | ||
| srcset="https://via.placeholder.com/253x360.jpg 1x,https://via.placeholder.com/506x720.jpg 2x"> | ||
| <source | ||
| media="(min-width: 960px)" | ||
| srcset="https://via.placeholder.com/211x300.jpg 1x,https://via.placeholder.com/422x600.jpg 2x"> | ||
| <source | ||
| media="(min-width: 720px)" | ||
| srcset="https://via.placeholder.com/253x360.jpg 1x,https://via.placeholder.com/506x720.jpg 2x"> | ||
| <source | ||
| media="(min-width: 541px)" | ||
| srcset="https://via.placeholder.com/253x360.jpg 1x,https://via.placeholder.com/506x720.jpg 2x"> | ||
| <source | ||
| media="(max-width: 540px)" | ||
| srcset="https://via.placeholder.com/211x300.jpg 1x,https://via.placeholder.com/422x600.jpg 2x"> | ||
| <img src="https://via.placeholder.com/506x720.jpg" class="img-fluid" alt="ALT"> | ||
| </picture> |
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,8 @@ | ||
| <picture> | ||
| <source media="(min-width: 1140px)" srcset="https://via.placeholder.com/95x95.jpg 1x,https://via.placeholder.com/190x190.jpg 2x"> | ||
| <source media="(min-width: 960px)" srcset="https://via.placeholder.com/95x95.jpg 1x,https://via.placeholder.com/190x190.jpg 2x"> | ||
| <source media="(min-width: 720px)" srcset="https://via.placeholder.com/80x80.jpg 1x,https://via.placeholder.com/160x160.jpg 2x"> | ||
| <source media="(min-width: 541px)" srcset="https://via.placeholder.com/120x120.jpg 1x,https://via.placeholder.com/240x204.jpg 2x"> | ||
| <source media="(max-width: 540px)" srcset="https://via.placeholder.com/540x540.jpg 1x,https://via.placeholder.com/1080x1080.jpg 2x"> | ||
| <img src="https://via.placeholder.com/95x95.jpg" class="img-fluid" alt="ALT"> | ||
| </picture> |
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 |
|---|---|---|
| @@ -1,9 +1,14 @@ | ||
| @charset 'utf-8'; | ||
|
|
||
| hr { | ||
| border-color: $gray-100; | ||
| width: 100%; | ||
|
|
||
| &.bold { | ||
| border-top-width: 3px; | ||
| } | ||
|
|
||
| &.darker { | ||
| border-color: $gray-200; | ||
| } | ||
| } |
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 |
|---|---|---|
| @@ -1,3 +1,7 @@ | ||
| <hr> | ||
|
|
||
| <hr class="bold"> | ||
|
|
||
| <hr class="darker"> | ||
|
|
||
| <hr class="bold darker"> |
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
1 change: 1 addition & 0 deletions
1
assets/components/atoms/social-icon/social-icon-link-group.twig
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
11 changes: 11 additions & 0 deletions
11
assets/components/atoms/social-icon/social-icon-single-link-with-details.twig
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,11 @@ | ||
| {% set pretty_name = pretty_name ?: 'Twitter' %} | ||
| {% set user_id = user_id ?: 'firstname.name' %} | ||
| {% set icon = icon ?: 'icon-twitter' %} | ||
| {% set round = round ? ' social-icon-round' : '' %} | ||
| {% set discrete = discrete ? ' social-icon-discrete' : '' %} | ||
| {% set negative = negative ? ' social-icon-negative' : '' %} | ||
| {% set url = url or '#' %} | ||
| <a href="{{ url }}" class="{{ 'social-icon social-icon-details social-' ~ icon ~ round ~ negative ~ discrete }}" rel="nofollow" title="View on {{ pretty_name }}"> | ||
| {% include '@atoms/icon/icon.twig' with { icon: icon } %} | ||
| <span class="user">{{ user_id }}</span> | ||
| </a> |
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 |
|---|---|---|
|
|
@@ -124,4 +124,5 @@ | |
|
|
||
| // | ||
| // pages: | ||
| @import 'pages/people-detail/people-detail'; | ||
| @import 'pages/blog-single/blog-single'; | ||
124 changes: 124 additions & 0 deletions
124
assets/components/molecules/collapse-group/collapse-group-people-contacts.twig
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,124 @@ | ||
| {% if title is not defined %}{% set title = 'Contact information' %}{% endif %} | ||
| {% if title %} | ||
| <h4>{{title}}</h4> | ||
| {% endif %} | ||
|
|
||
| <button | ||
| class="collapse-title collapse-title-desktop" | ||
| type="button" | ||
| data-toggle="collapse" | ||
| data-target="#collapse-1" | ||
| aria-expanded="false" | ||
| aria-controls="collapse-1" | ||
| > | ||
| <strong>Fonction précise</strong>, <span class="font-weight-normal">Nom du département</span> | ||
| </button> | ||
|
|
||
| <div class="collapse collapse-item show collapse-item-desktop" id="collapse-1"> | ||
|
|
||
| <div class="row pt-2 pb-2"> | ||
| <div class="col-md-5"> | ||
| <p itemprop="location" itemscope itemtype="http://schema.org/Place"> | ||
| <strong itemprop="name">EPFL PRES</strong><br/> | ||
| <span itemprop="address"> | ||
| CE 3 316 (Centre Est)<br/> | ||
| Station 1<br/> | ||
| CH-1015 Lausanne | ||
| </span> | ||
| </p> | ||
| </div> | ||
| <div class="col-md-7"> | ||
| <p> | ||
| <a href="tel:+41 21 666 77 88" class="btn btn-sm btn-secondary mb-2 align-baseline">+41 21 666 77 88</a> | ||
| <small class="align-baseline ml-2">Bureau principal: <a href="#">INN 019</a></small> | ||
| <br> | ||
| <a href="tel:+41 21 666 55 66" class="btn btn-sm btn-secondary mb-2 align-baseline">+41 21 666 55 66</a> | ||
| <small class="align-baseline ml-2">Bureau: <a href="#">INN 018</a></small> | ||
| <br> | ||
| <small>Unité: <a href="#">EPFL</a> › <a href="#">SI</a> › <a href="#">SI-EXOP</a> › <a href="#">EXAPP</a></small> | ||
| </p> | ||
| </div> | ||
| <div class="col-sm-12"> | ||
| <p><span class="sr-only">Web site: </span><a href="https://www.epfl.ch/about/vice-presidencies/vice-presidencies/information-systems/">https://www.epfl.ch/about/vice-presidencies/vice-presidencies/information-systems/</a></p> | ||
| </div> | ||
| </div> | ||
|
|
||
| </div> | ||
|
|
||
| <button | ||
| class="collapse-title collapse-title-desktop collapsed" | ||
| type="button" | ||
| data-toggle="collapse" | ||
| data-target="#collapse-2" | ||
| aria-expanded="false" | ||
| aria-controls="collapse-2" | ||
| > | ||
| <strong>Fonction précise</strong>, <span class="font-weight-normal">Nom du département</span> | ||
| </button> | ||
|
|
||
| <div class="collapse collapse-item collapse-item-desktop" id="collapse-2"> | ||
|
|
||
| <div class="row pt-2 pb-2"> | ||
| <div class="col-md-5"> | ||
| <p itemprop="location" itemscope itemtype="http://schema.org/Place"> | ||
| <strong itemprop="name">EPFL PRES</strong><br/> | ||
| <span itemprop="address"> | ||
| CE 3 316 (Centre Est)<br/> | ||
| Station 1<br/> | ||
| CH-1015 Lausanne | ||
| </span> | ||
| </p> | ||
| </div> | ||
| <div class="col-md-7"> | ||
| <p> | ||
| <a href="tel:+41 21 666 77 88" class="btn btn-sm btn-secondary mb-2 align-baseline">+41 21 666 77 88</a> | ||
| <small class="align-baseline ml-2">Bureau principal: <a href="#">INN 019</a></small> | ||
| <br> | ||
| <small>Unité: <a href="#">EPFL</a> › <a href="#">SI</a> › <a href="#">SI-EXOP</a> › <a href="#">EXAPP</a></small> | ||
| </p> | ||
| </div> | ||
| <div class="col-sm-12"> | ||
| <p><span class="sr-only">Web site: </span><a href="https://rh.epfl.ch/">https://rh.epfl.ch/</a></p> | ||
| </div> | ||
| </div> | ||
|
|
||
| </div> | ||
|
|
||
| <button | ||
| class="collapse-title collapse-title-desktop collapsed" | ||
| type="button" | ||
| data-toggle="collapse" | ||
| data-target="#collapse-3" | ||
| aria-expanded="false" | ||
| aria-controls="collapse-3" | ||
| > | ||
| <strong>Fonction précise</strong>, <span class="font-weight-normal">Nom du département</span> | ||
| </button> | ||
|
|
||
| <div class="collapse collapse-item collapse-item-desktop" id="collapse-3"> | ||
|
|
||
| <div class="row pt-2 pb-2"> | ||
| <div class="col-md-5"> | ||
| <p itemprop="location" itemscope itemtype="http://schema.org/Place"> | ||
| <strong itemprop="name">EPFL PRES</strong><br/> | ||
| <span itemprop="address"> | ||
| CE 3 316 (Centre Est)<br/> | ||
| Station 1<br/> | ||
| CH-1015 Lausanne | ||
| </span> | ||
| </p> | ||
| </div> | ||
| <div class="col-md-7"> | ||
| <p> | ||
| <a href="tel:+41 21 666 77 88" class="btn btn-sm btn-secondary mb-2 align-baseline">+41 21 666 77 88</a> | ||
| <small class="align-baseline ml-2">Bureau principal: <a href="#">INN 019</a></small> | ||
| <br> | ||
| <a href="tel:+41 21 666 55 66" class="btn btn-sm btn-secondary mb-2 align-baseline">+41 21 666 55 66</a> | ||
| <small class="align-baseline ml-2">Bureau: <a href="#">INN 018</a></small> | ||
| <br> | ||
| <small>Unité: <a href="#">EPFL</a> › <a href="#">SI</a> › <a href="#">SI-EXOP</a> › <a href="#">EXAPP</a></small> | ||
| </p> | ||
| </div> | ||
| </div> | ||
|
|
||
| </div> |
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
32 changes: 32 additions & 0 deletions
32
assets/components/molecules/list-group/list-group-infoscience.twig
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,32 @@ | ||
| <div class="list-group"> | ||
| {% for i in 1..3 %} | ||
| <div class="list-group-item list-group-item-borderless list-group-item-infoscience"> | ||
| <div class="record-content"> | ||
| <p>Noms des auteurs: <strong>Titre de la publication lorem ipsum dolor sit amet consectetur adipscing elit</strong>; <i>Sous-titre lorem ipsum dolor sit amet consectetur adipscing elit</i>; Références, lieu de publication, etc.</p> | ||
| </div> | ||
| <div class="item-metadata"> | ||
| <p class="item-date">18.11.2019</p> | ||
| <p class="item-links small"> | ||
| <a href="#" target="_blank">Notice détaillée</a> – <a href="#" target="_blank">Texte intégral</a> | ||
| </p> | ||
| </div> | ||
| </div> | ||
| {% endfor %} | ||
| <!-- Publication with thumbnail image --> | ||
| <div class="list-group-item list-group-item-borderless list-group-item-infoscience has-thumbnail"> | ||
| <div class="list-group-thumbnail"> | ||
| {% include '@atoms/picture/picture-thumb-square.twig' %} | ||
| </div> | ||
| <div class="list-group-content"> | ||
| <div class="record-content"> | ||
| <p>Noms des auteurs: <strong>Titre de la publication lorem ipsum dolor sit amet consectetur adipscing elit</strong>; <i>Sous-titre lorem ipsum dolor sit amet consectetur adipscing elit</i>; Références, lieu de publication, etc.</p> | ||
| </div> | ||
| <div class="item-metadata"> | ||
| <p class="item-date">18.11.2019</p> | ||
| <p class="item-links small"> | ||
| <a href="#" target="_blank">Notice détaillée</a> – <a href="#" target="_blank">Texte intégral</a> | ||
| </p> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> |
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
Oops, something went wrong.