Skip to content

Commit

Permalink
Merge pull request #157 from kyuchia/master
Browse files Browse the repository at this point in the history 
update lab member template and fix path issue
  • Loading branch information
@candlecao
candlecao authored Dec 13, 2024
2 parents a8a54b4 + 3eb3b80 commit 5769795
Show file tree
Hide file tree
Showing 7 changed files with 120 additions and 82 deletions.
38 changes: 19 additions & 19 deletions TEMPLATES/lab_member_template/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,50 +16,50 @@
Your Name · DDMAL
</title>
<!-- CSS -->
<link rel="stylesheet" href="../../assets/css/main.css" />
<link rel="stylesheet" href="../../../assets/css/main.css" />
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=PT+Serif:400,400italic,700%7CPT+Sans:400">
<link href="https://fonts.googleapis.com/css?family=Montserrat|Raleway:300,400,500" rel="stylesheet">
<!-- Icons -->
<link rel="apple-touch-icon-precomposed" sizes="144x144" href="../../public/mcgill_crest.png">
<link rel="shortcut icon" href="../../public/mcgill_crest.png">
<link rel="apple-touch-icon-precomposed" sizes="144x144" href="../../../public/mcgill_crest.png">
<link rel="shortcut icon" href="../../../public/mcgill_crest.png">
<!-- RSS -->
<link rel="alternate" type="application/rss+xml" title="RSS" href="/atom.xml">
</head>
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
<!-- DO NOT TOUCH NAV BAR -->
<nav class="navbar navbar-light fixed-top navbar-expand-lg bg-white">
<a class="navbar-brand" href="../../">DDMAL</a>
<a class="navbar-brand" href="../../../">DDMAL</a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbarSupportedContent">
<ul class="navbar-nav ml-auto" id="nav-items">
<li class="nav-item">
<a class="nav-link" href="../../">Home <span class="sr-only">(current)</span></a>
<a class="nav-link" href="../../../">Home <span class="sr-only">(current)</span></a>
</li>
<li class="nav-item">
<a class="nav-link" href="../../lab_members/">Lab Members</a>
<a class="nav-link" href="../../../lab_members/">Lab Members</a>
</li>
<li class="dropdown">
<a class="dropdown-toggle" role="button" data-toggle="dropdown" href="#">Activities<span class="caret"></span></a>
<ul class="dropdown-menu" role="menu">
<li><a href='../../activities/media/' target='_top' >Media</a></li>
<li><a href='../../activities/posters/' target='_top' >Posters</a></li>
<li><a href='../../activities/presentations/' target='_top' >Presentations</a></li>
<li><a href='../../activities/publications/' target='_top' >Publications</a></li>
<li><a href='../../../activities/media/' target='_top' >Media</a></li>
<li><a href='../../../activities/posters/' target='_top' >Posters</a></li>
<li><a href='../../../activities/presentations/' target='_top' >Presentations</a></li>
<li><a href='../../../activities/publications/' target='_top' >Publications</a></li>
</ul>
</li>
<li class="nav-item">
<a class="nav-link" href="../../research/">Research</a>
<a class="nav-link" href="../../../research/">Research</a>
</li>
<li class="nav-item">
<a class="nav-link" href="../../software/">Software</a>
<a class="nav-link" href="../../../software/">Software</a>
</li>
<li class="nav-item">
<a class="nav-link" href="../../events/">Events</a>
<a class="nav-link" href="../../../events/">Events</a>
</li>
<li class="nav-item">
<a class="nav-link" href="../../resources/">Resources</a>
<a class="nav-link" href="../../../resources/">Resources</a>
</li>
</ul>
</div>
Expand All @@ -74,12 +74,12 @@
<!-- TODO: add your name here -->
<h1 style="text-align: left;" class="page-title">Your Name</h1>
<!-- TODO: link your cv in the href attribute here, or comment this line out -->
<a href="../../assets/lab_members/cv/functionalsample.pdf"><img class="cv-icon" src="../../assets/resume-document.png" /></a>
<a href="../../../assets/lab_members/cv/functionalsample.pdf"><img class="cv-icon" src="../../assets/resume-document.png" /></a>
<!-- NOTE: make sure to add your pdf file to the assets/lab_members/cv directory -->
</div>
<div class="img-wrap">
<!-- TODO: link your image here. If you want a placeholder image, leave as-is -->
<img class="profile-photo" src="../../assets/lab_members/placeholder.png"/>
<img class="profile-photo" src="../../../assets/lab_members/placeholder.png"/>
<div class="social-links">
<!-- TODO: link your Github in the href attribute here, or comment out the entire <a> tag -->
<a class="social__link" target="_blank" rel="noopener noreferrer" href="https://github.com/youraccount">
Expand Down Expand Up @@ -178,13 +178,13 @@ <h4 class="lab_member_subtitles">Publications </h4>
<label for="sidebar-checkbox" class="sidebar-toggle"></label>
<footer id="sticky">
<div class="footer-img-wrap">
<img class="mcgill-img-footer" src="../../assets/schulich_logo.png" alt="">
<img class="ddmal-img-footer" src="../../assets/Ddmal_logo_transp-bg_no-border_1600w.png" alt="">
<img class="mcgill-img-footer" src="../../../assets/schulich_logo.png" alt="">
<img class="ddmal-img-footer" src="../../../assets/Ddmal_logo_transp-bg_no-border_1600w.png" alt="">
</div>
</footer>
<script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.6/umd/popper.min.js" integrity="sha384-wHAiFfRlMFy6i5SRaxvfOCifBUQy1xHdJ/yoi7FRNXMRBu5WHdZYu1hA6ZOblgut" crossorigin="anonymous"></script>
<script src="../../js/bootstrap.js"></script>
<script src="../../../js/bootstrap.js"></script>
<script type="text/javascript">
$(document).ready(function () {
var url = window.location;
Expand Down
Binary file added assets/lab_members/junjun_cao_2022.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/lab_members/thumbnail/LiamPondProfilePic.jpeg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/lab_members/thumbnail/junjun_cao_2022.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 4 additions & 4 deletions lab_members/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,9 +97,9 @@ <h3 class="people-title"> Postdoctoral Researchers </h3>
<li><a href="../lab_members/postdocs/anna_de_bakker/">Anna de Bakker</a><a
href="../lab_members/postdocs/anna_de_bakker/"><img class="member_photo_list"
src="../assets/lab_members/thumbnail/placeholder.png" /></a></li>
<!-- <li><a href="../lab_members/postdocs/junjun_cao/">Junjun Cao</a><a
<li><a href="../lab_members/postdocs/junjun_cao/">Junjun Cao</a><a
href="../lab_members/postdocs/junjun_cao/"><img class="member_photo_list"
src="../assets/lab_members/thumbnail/placeholder.png" /></a></li> -->
src="../assets/lab_members/thumbnail/junjun_cao_2022.jpg" /></a></li>
</ul>


Expand Down Expand Up @@ -139,9 +139,9 @@ <h3 class="people-title"> Masters </h3>
<li><a href="../lab_members/masters/kai_mikkelsen/">Kai Mikkelsen</a><a
href="../lab_members/masters/kai_mikkelsen/"><img class="member_photo_list"
src="../assets/lab_members/thumbnail/placeholder.png" /></a></li>
<!-- <li><a href="../lab_members/masters/liam_pond/">Liam Pond</a><a
<li><a href="../lab_members/masters/liam_pond/">Liam Pond</a><a
href="../lab_members/masters/liam_pond/"><img class="member_photo_list"
src="../assets/lab_members/thumbnail/placeholder.png" /></a></li> -->
src="../assets/lab_members/thumbnail/LiamPondProfilePic.jpeg" /></a></li>
<li><a href="../lab_members/masters/yuchia_kuo/">Yu Chia Kuo</a><a
href="../lab_members/masters/yuchia_kuo/"><img class="member_photo_list"
src="../assets/lab_members/thumbnail/kyuchia_2023.JPG" /></a></li>
Expand Down
36 changes: 18 additions & 18 deletions lab_members/masters/liam_pond/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@
Liam Pond &middot; DDMAL
</title>
<!-- CSS -->
<link rel="stylesheet" href="../../assets/css/main.css" />
<link rel="stylesheet" href="../../../assets/css/main.css" />
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=PT+Serif:400,400italic,700%7CPT+Sans:400">
<link href="https://fonts.googleapis.com/css?family=Montserrat|Raleway:300,400,500" rel="stylesheet">
<!-- Icons -->
<link rel="apple-touch-icon-precomposed" sizes="144x144" href="../../public/mcgill_crest.png">
<link rel="shortcut icon" href="../../public/mcgill_crest.png">
<link rel="apple-touch-icon-precomposed" sizes="144x144" href="../../../public/mcgill_crest.png">
<link rel="shortcut icon" href="../../../public/mcgill_crest.png">
<!-- RSS -->
<link rel="alternate" type="application/rss+xml" title="RSS" href="/atom.xml">
</head>
Expand All @@ -35,31 +35,31 @@
<div class="collapse navbar-collapse" id="navbarSupportedContent">
<ul class="navbar-nav ml-auto" id="nav-items">
<li class="nav-item">
<a class="nav-link" href="../../">Home <span class="sr-only">(current)</span></a>
<a class="nav-link" href="../../../">Home <span class="sr-only">(current)</span></a>
</li>
<li class="nav-item">
<a class="nav-link" href="../../lab_members/">Lab Members</a>
<a class="nav-link" href="../../../lab_members/">Lab Members</a>
</li>
<li class="dropdown">
<a class="dropdown-toggle" role="button" data-toggle="dropdown" href="#">Activities<span class="caret"></span></a>
<ul class="dropdown-menu" role="menu">
<li><a href='../../activities/media/' target='_top' >Media</a></li>
<li><a href='../../activities/posters/' target='_top' >Posters</a></li>
<li><a href='../../activities/presentations/' target='_top' >Presentations</a></li>
<li><a href='../../activities/publications/' target='_top' >Publications</a></li>
<li><a href='../../../activities/media/' target='_top' >Media</a></li>
<li><a href='../../../activities/posters/' target='_top' >Posters</a></li>
<li><a href='../../../activities/presentations/' target='_top' >Presentations</a></li>
<li><a href='../../../activities/publications/' target='_top' >Publications</a></li>
</ul>
</li>
<li class="nav-item">
<a class="nav-link" href="../../research/">Research</a>
<a class="nav-link" href="../../../research/">Research</a>
</li>
<li class="nav-item">
<a class="nav-link" href="../../software/">Software</a>
<a class="nav-link" href="../../../software/">Software</a>
</li>
<li class="nav-item">
<a class="nav-link" href="../../events/">Events</a>
<a class="nav-link" href="../../../events/">Events</a>
</li>
<li class="nav-item">
<a class="nav-link" href="../../resources/">Resources</a>
<a class="nav-link" href="../../../resources/">Resources</a>
</li>
</ul>
</div>
Expand All @@ -74,12 +74,12 @@
<!-- DONE: add your name here -->
<h1 style="text-align: left;" class="page-title">Liam Pond</h1>
<!-- DONE: link your cv in the href attribute here, or comment this line out -->
<a href="../../assets/lab_members/cv/CV_LiamPond_Oct2024.pdf"><img class="cv-icon" src="../../assets/resume-document.png" /></a>
<a href="../../../assets/lab_members/cv/CV_LiamPond_Oct2024.pdf"><img class="cv-icon" src="../../../assets/resume-document.png" /></a>
<!-- NOTE: make sure to add your pdf file to the assets/lab_members/cv directory -->
</div>
<div class="img-wrap">
<!-- DONE: link your image here. If you want a placeholder image, leave as-is -->
<img class="profile-photo" src="../../assets/lab_members/LiamPondProfilePic.jpeg"/>
<img class="profile-photo" src="../../../assets/lab_members/LiamPondProfilePic.jpeg"/>
<div class="social-links">
<!-- DONE: link your Github in the href attribute here, or comment out the entire <a> tag -->
<a class="social__link" target="_blank" rel="noopener noreferrer" href="https://github.com/liampond">
Expand Down Expand Up @@ -180,13 +180,13 @@ <h4 class="lab_member_subtitles">Publications </h4>
<label for="sidebar-checkbox" class="sidebar-toggle"></label>
<footer id="sticky">
<div class="footer-img-wrap">
<img class="mcgill-img-footer" src="../../assets/schulich_logo.png" alt="">
<img class="ddmal-img-footer" src="../../assets/Ddmal_logo_transp-bg_no-border_1600w.png" alt="">
<img class="mcgill-img-footer" src="../../../assets/schulich_logo.png" alt="">
<img class="ddmal-img-footer" src="../../../assets/Ddmal_logo_transp-bg_no-border_1600w.png" alt="">
</div>
</footer>
<script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.6/umd/popper.min.js" integrity="sha384-wHAiFfRlMFy6i5SRaxvfOCifBUQy1xHdJ/yoi7FRNXMRBu5WHdZYu1hA6ZOblgut" crossorigin="anonymous"></script>
<script src="../../js/bootstrap.js"></script>
<script src="../../../js/bootstrap.js"></script>
<script type="text/javascript">
$(document).ready(function () {
var url = window.location;
Expand Down
Loading

0 comments on commit 5769795

Please sign in to comment.