Skip to content

Commit

Permalink
Merge pull request #99 from KasukabeDefenceForce/main
Browse files Browse the repository at this point in the history
Add authors instead of contributors and add colors to tags
  • Loading branch information
KasukabeDefenceForce authored Feb 24, 2025
2 parents b9b68b1 + 73e898b commit c0fc76d
Show file tree
Hide file tree
Showing 2 changed files with 92 additions and 45 deletions.
54 changes: 51 additions & 3 deletions notebooks/create_htmls.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,38 @@
"MEMBERS_DIR_PATH = GROUP_DATA_DIR / \"members/\"\n",
"SUB_RESEARCH_PATH = HOSTING_PATH / \"sub_research\"\n",
"OPPORTUNITIES_PATH = WEBSITE_DATA_PATH / \"content\" / \"opportunities.json\"\n",
"ROLE_HIERARCHY_PATH = WEBSITE_DATA_PATH / \"role_hierarchy.json\""
"ROLE_HIERARCHY_PATH = WEBSITE_DATA_PATH / \"role_hierarchy.json\"\n",
"GENERAL_TAGS = [\n",
" \"Paper\",\n",
" \"Poster\", \n",
" \"Talk\",\n",
" \"Award\",\n",
" \"New Team Member\",\n",
" \"PhD\",\n",
" \"Conference\",\n",
" \"Undergraduate\",\n",
" \"Event\",\n",
" \"Achievement\"\n",
"]\n",
"\n",
"# Define tag colors mapping\n",
"TAG_COLORS = {\n",
" 'paper': '#FF6B6B', # Coral red\n",
" 'poster': '#4ECDC4', # Turquoise\n",
" 'talk': '#45B7D1', # Light blue\n",
" 'award': '#96CEB4', # Sage green\n",
" 'new team member': '#FFBE0B', # Golden yellow\n",
" 'phd': '#9B5DE5', # Purple\n",
" 'conference': '#FF006E', # Pink\n",
" 'undergraduate': '#8338EC', # Violet\n",
" 'event': '#3A86FF', # Royal blue\n",
" 'achievement': '#FB5607', # Orange\n",
" 'astrophysics': '#2EC4B6', # Teal\n",
" 'machine learning': '#FF9F1C', # Light orange\n",
" 'software': '#E71D36', # Bright red\n",
" 'research': '#011627', # Dark blue\n",
" 'news': '#41EAD4' # Cyan\n",
"}"
]
},
{
Expand All @@ -86,7 +117,7 @@
},
{
"cell_type": "code",
"execution_count": 41,
"execution_count": 92,
"metadata": {
"ExecuteTime": {
"end_time": "2023-11-21T07:07:36.311056453Z",
Expand All @@ -100,10 +131,27 @@
" \"\"\"Return the HTML file name after replacing blank spaces(\" \") with underscores(\"-\")\"\"\"\n",
" return a.replace(\" \", \"_\") if \" \" in a else a\n",
"\n",
"# Function to get tag color, returns a default if tag not in mapping\n",
"def get_tag_color(tag):\n",
" \"\"\"Get color for a specific tag, with fallback to default\"\"\"\n",
" tag = tag.lower()\n",
" return TAG_COLORS.get(tag, '#6c757d') # Default gray if tag not found\n",
"\n"
]
},
{
"cell_type": "code",
"execution_count": 93,
"metadata": {},
"outputs": [],
"source": [
"environment = Environment(\n",
" loader=FileSystemLoader(TEMPLATE_DIR_PATH), extensions=[\"jinja2.ext.loopcontrols\", \"jinja2.ext.do\"]\n",
")\n",
"environment.globals[\"page_link\"] = page_link"
"environment.globals[\"page_link\"] = page_link\n",
"# Add tag colors to jinja environment globals\n",
"environment.globals['tag_colors'] = TAG_COLORS\n",
"environment.globals['get_tag_color'] = get_tag_color"
]
},
{
Expand Down
83 changes: 41 additions & 42 deletions templates/news.html.j2
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@
<div class='badge-tray'>
{%for tag in news['tags']%}
{%if tag.lower() != "news"%}
<span class="badge">{{tag.title()}}</span>
<span class="badge" style="background-color: {{ tag_colors[tag.lower()] }}">{{tag.title()}}</span>
{%endif%}
{%endfor%}
</div>
Expand All @@ -138,7 +138,6 @@
</div>
#}
</div>
{% if "achievement" in news['tags']%}
<div class="card-footer">
{% set author_id = news['author_id'] %}
{% if author_id in member_data%}
Expand All @@ -156,46 +155,46 @@
</div>
{% endif %}
</div>
{% else %}
<div class="card-footer">
<div>
<ul class="blog-meta">
<li>
<a style="font-size:10px">Contributer(s):</a>
</li>
{% for person_id in news.people_involved_ids %}
{% if person_id in member_data %}
{% set member_info = member_data[person_id] %}
{% set member_name = member_info.get('full_name') %}
<li>
<a href="members/{{ person_id }}/{{ person_id }}.html" target="_blank">
<p style="font-size: 10px; height:35px"> {{member_name}}</p>
</a>
</li>
{% elif person_id.strip().split(' ')[-1].strip().lower().startswith("http://") or
person_id.strip().split(' ')[-1].strip().lower().startswith("https://") %}
<li>
<a href="{{ person_id.strip().split(' ')[-1] }}" target="_blank"
style="font-size: 10px;">
{{ person_id.strip().split(' ')[0] }}
</a>
</li>

{% else %}
<li>
<a style="font-size: 10px;">
{{ person_id }}
</a>
</li>
{% endif %}
{% if not loop.last %}
<li>, </li>
{% endif %}
{% endfor %}
</ul>
</div>
</div>
{% endif %}
{#
<div class="card-footer">
<div>
<ul class="blog-meta">
<li>
<a style="font-size:10px">Contributer(s):</a>
</li>
{% for person_id in news.people_involved_ids %}
{% if person_id in member_data %}
{% set member_info = member_data[person_id] %}
{% set member_name = member_info.get('full_name') %}
<li>
<a href="members/{{ person_id }}/{{ person_id }}.html" target="_blank">
<p style="font-size: 10px; height:35px"> {{member_name}}</p>
</a>
</li>
{% elif person_id.strip().split(' ')[-1].strip().lower().startswith("http://") or
person_id.strip().split(' ')[-1].strip().lower().startswith("https://") %}
<li>
<a href="{{ person_id.strip().split(' ')[-1] }}" target="_blank"
style="font-size: 10px;">
{{ person_id.strip().split(' ')[0] }}
</a>
</li>
{% else %}
<li>
<a style="font-size: 10px;">
{{ person_id }}
</a>
</li>
{% endif %}
{% if not loop.last %}
<li>, </li>
{% endif %}
{% endfor %}
</ul>
</div>
</div>
#}
</div>
</div>
</div>
Expand Down

0 comments on commit c0fc76d

Please sign in to comment.