Skip to content

Add tags and filtering for Affiliations #160

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.

Sign up for GitHub

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

Merged
merged 12 commits into from
Oct 22, 2021
Merged

Add tags and filtering for Affiliations #160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
3916c9d
add affiliation to tag_list
jukent Sep 16, 2021
6504bbd
change affiliation to institution
jukent Sep 16, 2021
afbbb2a
missed one!
jukent Sep 16, 2021
c1e5770
add some affiliation tags
jukent Sep 16, 2021
d0e8c6a
pre-commit
jukent Sep 16, 2021
f656672
Merge branch 'main' into affiliation-tags
jukent Sep 16, 2021
58cc8d9
Merge branch 'main' into affiliation-tags
jukent Sep 17, 2021
c4423b7
Merge branch 'main' into affiliation-tags
jukent Sep 17, 2021
e59ff62
Merge branch 'ProjectPythia:main' into affiliation-tags
jukent Oct 21, 2021
49b8a24
add affiliation tags to videos
jukent Oct 21, 2021
e3f8d37
rm trailing whitespace
jukent Oct 21, 2021
ce09362
affiliation to institution in new video entries
jukent Oct 21, 2021
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
26 changes: 13 additions & 13 deletions portal/_extensions/yaml_gallery_generator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ def build_from_items(items, filename, title='Gallery', subtitle=None, menu_html=
tags = '\n'.join(tags)

author_strs = set()
affiliation_strs = set()
institution_strs = set()
for a in item['authors']:
author_name = a.get('name', 'Anonymous')
author_email = a.get('email', None)
Expand All @@ -99,20 +99,20 @@ def build_from_items(items, filename, title='Gallery', subtitle=None, menu_html=
_str = author_name
author_strs.add(_str)

affiliation_name = a.get('affiliation', None)
if affiliation_name:
affiliation_url = a.get('affiliation_url', None)
if affiliation_url:
_str = f'<a href="{affiliation_url}">{affiliation_name}</a>'
institution_name = a.get('institution', None)
if institution_name:
institution_url = a.get('institution_url', None)
if institution_url:
_str = f'<a href="{institution_url}">{institution_name}</a>'
else:
_str = affiliation_name
affiliation_strs.add(_str)
_str = institution_name
institution_strs.add(_str)

authors_str = f"<strong>Author:</strong> {', '.join(author_strs)}"
if affiliation_strs:
affiliations_str = f"<strong>Affiliation:</strong> {' '.join(affiliation_strs)}"
if institution_strs:
institutions_str = f"<strong>Institution:</strong> {' '.join(institution_strs)}"
else:
affiliations_str = ''
institutions_str = ''

if len(item['description']) < max_descr_len:
short_description = item['description']
Expand All @@ -128,7 +128,7 @@ def build_from_items(items, filename, title='Gallery', subtitle=None, menu_html=
<h3 class="display-3">{item["title"]}</h3>
{authors_str}
<br/>
{affiliations_str}
{institutions_str}
<p class="my-2">{item['description']}</p>
<p class="my-2">{tags}</p>
<p class="mt-3 mb-0"><a href="{item["url"]}" class="btn btn-outline-primary btn-block">Visit Website</a></p>
Expand All @@ -144,7 +144,7 @@ def build_from_items(items, filename, title='Gallery', subtitle=None, menu_html=
<img src="{thumbnail}" class="gallery-thumbnail" />
<div class="container">
<a href="{item["url"]}" class="text-decoration-none"><h4 class="display-4 p-0">{item["title"]}</h4></a>
<p class="card-subtitle">{authors_str}<br/>{affiliations_str}</p>
<p class="card-subtitle">{authors_str}<br/>{institutions_str}</p>
<p class="my-2">{short_description}</p>
</div>
</div>
Expand Down
Loading