Skip to content

Commit 5769795

Browse files
candlecaocandlecao
authored
Merge pull request #157 from kyuchia/master
update lab member template and fix path issue
2 parents a8a54b4 + 3eb3b80 commit 5769795

File tree

7 files changed

+120
-82
lines changed

7 files changed

+120
-82
lines changed

‎TEMPLATES/lab_member_template/index.html‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -16,50 +16,50 @@
1616
Your Name · DDMAL
1717
</title>
1818
<!-- CSS -->
19-
<link rel="stylesheet" href="../../assets/css/main.css" />
19+
<link rel="stylesheet" href="../../../assets/css/main.css" />
2020
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=PT+Serif:400,400italic,700%7CPT+Sans:400">
2121
<link href="https://fonts.googleapis.com/css?family=Montserrat|Raleway:300,400,500" rel="stylesheet">
2222
<!-- Icons -->
23-
<link rel="apple-touch-icon-precomposed" sizes="144x144" href="../../public/mcgill_crest.png">
24-
<link rel="shortcut icon" href="../../public/mcgill_crest.png">
23+
<link rel="apple-touch-icon-precomposed" sizes="144x144" href="../../../public/mcgill_crest.png">
24+
<link rel="shortcut icon" href="../../../public/mcgill_crest.png">
2525
<!-- RSS -->
2626
<link rel="alternate" type="application/rss+xml" title="RSS" href="/atom.xml">
2727
</head>
2828
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
2929
<!-- DO NOT TOUCH NAV BAR -->
3030
<nav class="navbar navbar-light fixed-top navbar-expand-lg bg-white">
31-
<a class="navbar-brand" href="../../">DDMAL</a>
31+
<a class="navbar-brand" href="../../../">DDMAL</a>
3232
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
3333
<span class="navbar-toggler-icon"></span>
3434
</button>
3535
<div class="collapse navbar-collapse" id="navbarSupportedContent">
3636
<ul class="navbar-nav ml-auto" id="nav-items">
3737
<li class="nav-item">
38-
<a class="nav-link" href="../../">Home <span class="sr-only">(current)</span></a>
38+
<a class="nav-link" href="../../../">Home <span class="sr-only">(current)</span></a>
3939
</li>
4040
<li class="nav-item">
41-
<a class="nav-link" href="../../lab_members/">Lab Members</a>
41+
<a class="nav-link" href="../../../lab_members/">Lab Members</a>
4242
</li>
4343
<li class="dropdown">
4444
<a class="dropdown-toggle" role="button" data-toggle="dropdown" href="#">Activities<span class="caret"></span></a>
4545
<ul class="dropdown-menu" role="menu">
46-
<li><a href='../../activities/media/' target='_top' >Media</a></li>
47-
<li><a href='../../activities/posters/' target='_top' >Posters</a></li>
48-
<li><a href='../../activities/presentations/' target='_top' >Presentations</a></li>
49-
<li><a href='../../activities/publications/' target='_top' >Publications</a></li>
46+
<li><a href='../../../activities/media/' target='_top' >Media</a></li>
47+
<li><a href='../../../activities/posters/' target='_top' >Posters</a></li>
48+
<li><a href='../../../activities/presentations/' target='_top' >Presentations</a></li>
49+
<li><a href='../../../activities/publications/' target='_top' >Publications</a></li>
5050
</ul>
5151
</li>
5252
<li class="nav-item">
53-
<a class="nav-link" href="../../research/">Research</a>
53+
<a class="nav-link" href="../../../research/">Research</a>
5454
</li>
5555
<li class="nav-item">
56-
<a class="nav-link" href="../../software/">Software</a>
56+
<a class="nav-link" href="../../../software/">Software</a>
5757
</li>
5858
<li class="nav-item">
59-
<a class="nav-link" href="../../events/">Events</a>
59+
<a class="nav-link" href="../../../events/">Events</a>
6060
</li>
6161
<li class="nav-item">
62-
<a class="nav-link" href="../../resources/">Resources</a>
62+
<a class="nav-link" href="../../../resources/">Resources</a>
6363
</li>
6464
</ul>
6565
</div>
@@ -74,12 +74,12 @@
7474
<!-- TODO: add your name here -->
7575
<h1 style="text-align: left;" class="page-title">Your Name</h1>
7676
<!-- TODO: link your cv in the href attribute here, or comment this line out -->
77-
<a href="../../assets/lab_members/cv/functionalsample.pdf"><img class="cv-icon" src="../../assets/resume-document.png" /></a>
77+
<a href="../../../assets/lab_members/cv/functionalsample.pdf"><img class="cv-icon" src="../../assets/resume-document.png" /></a>
7878
<!-- NOTE: make sure to add your pdf file to the assets/lab_members/cv directory -->
7979
</div>
8080
<div class="img-wrap">
8181
<!-- TODO: link your image here. If you want a placeholder image, leave as-is -->
82-
<img class="profile-photo" src="../../assets/lab_members/placeholder.png"/>
82+
<img class="profile-photo" src="../../../assets/lab_members/placeholder.png"/>
8383
<div class="social-links">
8484
<!-- TODO: link your Github in the href attribute here, or comment out the entire <a> tag -->
8585
<a class="social__link" target="_blank" rel="noopener noreferrer" href="https://github.com/youraccount">
@@ -178,13 +178,13 @@ <h4 class="lab_member_subtitles">Publications </h4>
178178
<label for="sidebar-checkbox" class="sidebar-toggle"></label>
179179
<footer id="sticky">
180180
<div class="footer-img-wrap">
181-
<img class="mcgill-img-footer" src="../../assets/schulich_logo.png" alt="">
182-
<img class="ddmal-img-footer" src="../../assets/Ddmal_logo_transp-bg_no-border_1600w.png" alt="">
181+
<img class="mcgill-img-footer" src="../../../assets/schulich_logo.png" alt="">
182+
<img class="ddmal-img-footer" src="../../../assets/Ddmal_logo_transp-bg_no-border_1600w.png" alt="">
183183
</div>
184184
</footer>
185185
<script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
186186
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.6/umd/popper.min.js" integrity="sha384-wHAiFfRlMFy6i5SRaxvfOCifBUQy1xHdJ/yoi7FRNXMRBu5WHdZYu1hA6ZOblgut" crossorigin="anonymous"></script>
187-
<script src="../../js/bootstrap.js"></script>
187+
<script src="../../../js/bootstrap.js"></script>
188188
<script type="text/javascript">
189189
$(document).ready(function () {
190190
var url = window.location;

‎assets/lab_members/junjun_cao_2022.jpg‎

422 KB
Loading

‎assets/lab_members/thumbnail/LiamPondProfilePic.jpeg‎

458 KB
Loading

‎assets/lab_members/thumbnail/junjun_cao_2022.jpg‎

422 KB
Loading

‎lab_members/index.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,9 @@ <h3 class="people-title"> Postdoctoral Researchers </h3>
9797
<li><a href="../lab_members/postdocs/anna_de_bakker/">Anna de Bakker</a><a
9898
href="../lab_members/postdocs/anna_de_bakker/"><img class="member_photo_list"
9999
src="../assets/lab_members/thumbnail/placeholder.png" /></a></li>
100-
<!-- <li><a href="../lab_members/postdocs/junjun_cao/">Junjun Cao</a><a
100+
<li><a href="../lab_members/postdocs/junjun_cao/">Junjun Cao</a><a
101101
href="../lab_members/postdocs/junjun_cao/"><img class="member_photo_list"
102-
src="../assets/lab_members/thumbnail/placeholder.png" /></a></li> -->
102+
src="../assets/lab_members/thumbnail/junjun_cao_2022.jpg" /></a></li>
103103
</ul>
104104

105105

@@ -139,9 +139,9 @@ <h3 class="people-title"> Masters </h3>
139139
<li><a href="../lab_members/masters/kai_mikkelsen/">Kai Mikkelsen</a><a
140140
href="../lab_members/masters/kai_mikkelsen/"><img class="member_photo_list"
141141
src="../assets/lab_members/thumbnail/placeholder.png" /></a></li>
142-
<!-- <li><a href="../lab_members/masters/liam_pond/">Liam Pond</a><a
142+
<li><a href="../lab_members/masters/liam_pond/">Liam Pond</a><a
143143
href="../lab_members/masters/liam_pond/"><img class="member_photo_list"
144-
src="../assets/lab_members/thumbnail/placeholder.png" /></a></li> -->
144+
src="../assets/lab_members/thumbnail/LiamPondProfilePic.jpeg" /></a></li>
145145
<li><a href="../lab_members/masters/yuchia_kuo/">Yu Chia Kuo</a><a
146146
href="../lab_members/masters/yuchia_kuo/"><img class="member_photo_list"
147147
src="../assets/lab_members/thumbnail/kyuchia_2023.JPG" /></a></li>

‎lab_members/masters/liam_pond/index.html‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@
1616
Liam Pond &middot; DDMAL
1717
</title>
1818
<!-- CSS -->
19-
<link rel="stylesheet" href="../../assets/css/main.css" />
19+
<link rel="stylesheet" href="../../../assets/css/main.css" />
2020
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=PT+Serif:400,400italic,700%7CPT+Sans:400">
2121
<link href="https://fonts.googleapis.com/css?family=Montserrat|Raleway:300,400,500" rel="stylesheet">
2222
<!-- Icons -->
23-
<link rel="apple-touch-icon-precomposed" sizes="144x144" href="../../public/mcgill_crest.png">
24-
<link rel="shortcut icon" href="../../public/mcgill_crest.png">
23+
<link rel="apple-touch-icon-precomposed" sizes="144x144" href="../../../public/mcgill_crest.png">
24+
<link rel="shortcut icon" href="../../../public/mcgill_crest.png">
2525
<!-- RSS -->
2626
<link rel="alternate" type="application/rss+xml" title="RSS" href="/atom.xml">
2727
</head>
@@ -35,31 +35,31 @@
3535
<div class="collapse navbar-collapse" id="navbarSupportedContent">
3636
<ul class="navbar-nav ml-auto" id="nav-items">
3737
<li class="nav-item">
38-
<a class="nav-link" href="../../">Home <span class="sr-only">(current)</span></a>
38+
<a class="nav-link" href="../../../">Home <span class="sr-only">(current)</span></a>
3939
</li>
4040
<li class="nav-item">
41-
<a class="nav-link" href="../../lab_members/">Lab Members</a>
41+
<a class="nav-link" href="../../../lab_members/">Lab Members</a>
4242
</li>
4343
<li class="dropdown">
4444
<a class="dropdown-toggle" role="button" data-toggle="dropdown" href="#">Activities<span class="caret"></span></a>
4545
<ul class="dropdown-menu" role="menu">
46-
<li><a href='../../activities/media/' target='_top' >Media</a></li>
47-
<li><a href='../../activities/posters/' target='_top' >Posters</a></li>
48-
<li><a href='../../activities/presentations/' target='_top' >Presentations</a></li>
49-
<li><a href='../../activities/publications/' target='_top' >Publications</a></li>
46+
<li><a href='../../../activities/media/' target='_top' >Media</a></li>
47+
<li><a href='../../../activities/posters/' target='_top' >Posters</a></li>
48+
<li><a href='../../../activities/presentations/' target='_top' >Presentations</a></li>
49+
<li><a href='../../../activities/publications/' target='_top' >Publications</a></li>
5050
</ul>
5151
</li>
5252
<li class="nav-item">
53-
<a class="nav-link" href="../../research/">Research</a>
53+
<a class="nav-link" href="../../../research/">Research</a>
5454
</li>
5555
<li class="nav-item">
56-
<a class="nav-link" href="../../software/">Software</a>
56+
<a class="nav-link" href="../../../software/">Software</a>
5757
</li>
5858
<li class="nav-item">
59-
<a class="nav-link" href="../../events/">Events</a>
59+
<a class="nav-link" href="../../../events/">Events</a>
6060
</li>
6161
<li class="nav-item">
62-
<a class="nav-link" href="../../resources/">Resources</a>
62+
<a class="nav-link" href="../../../resources/">Resources</a>
6363
</li>
6464
</ul>
6565
</div>
@@ -74,12 +74,12 @@
7474
<!-- DONE: add your name here -->
7575
<h1 style="text-align: left;" class="page-title">Liam Pond</h1>
7676
<!-- DONE: link your cv in the href attribute here, or comment this line out -->
77-
<a href="../../assets/lab_members/cv/CV_LiamPond_Oct2024.pdf"><img class="cv-icon" src="../../assets/resume-document.png" /></a>
77+
<a href="../../../assets/lab_members/cv/CV_LiamPond_Oct2024.pdf"><img class="cv-icon" src="../../../assets/resume-document.png" /></a>
7878
<!-- NOTE: make sure to add your pdf file to the assets/lab_members/cv directory -->
7979
</div>
8080
<div class="img-wrap">
8181
<!-- DONE: link your image here. If you want a placeholder image, leave as-is -->
82-
<img class="profile-photo" src="../../assets/lab_members/LiamPondProfilePic.jpeg"/>
82+
<img class="profile-photo" src="../../../assets/lab_members/LiamPondProfilePic.jpeg"/>
8383
<div class="social-links">
8484
<!-- DONE: link your Github in the href attribute here, or comment out the entire <a> tag -->
8585
<a class="social__link" target="_blank" rel="noopener noreferrer" href="https://github.com/liampond">
@@ -180,13 +180,13 @@ <h4 class="lab_member_subtitles">Publications </h4>
180180
<label for="sidebar-checkbox" class="sidebar-toggle"></label>
181181
<footer id="sticky">
182182
<div class="footer-img-wrap">
183-
<img class="mcgill-img-footer" src="../../assets/schulich_logo.png" alt="">
184-
<img class="ddmal-img-footer" src="../../assets/Ddmal_logo_transp-bg_no-border_1600w.png" alt="">
183+
<img class="mcgill-img-footer" src="../../../assets/schulich_logo.png" alt="">
184+
<img class="ddmal-img-footer" src="../../../assets/Ddmal_logo_transp-bg_no-border_1600w.png" alt="">
185185
</div>
186186
</footer>
187187
<script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
188188
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.6/umd/popper.min.js" integrity="sha384-wHAiFfRlMFy6i5SRaxvfOCifBUQy1xHdJ/yoi7FRNXMRBu5WHdZYu1hA6ZOblgut" crossorigin="anonymous"></script>
189-
<script src="../../js/bootstrap.js"></script>
189+
<script src="../../../js/bootstrap.js"></script>
190190
<script type="text/javascript">
191191
$(document).ready(function () {
192192
var url = window.location;

0 commit comments

Comments
 (0)