Skip to content

Commit

Permalink
Final Update Before Live
Browse files Browse the repository at this point in the history 
Added additional people, added emails, updated about us, and updated header
  • Loading branch information
@HenryWard
HenryWard committed Feb 3, 2020
1 parent 0953872 commit 1e7f42a
Show file tree
Hide file tree
Showing 6 changed files with 41 additions and 9 deletions.
6 changes: 3 additions & 3 deletions contact.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,21 +63,21 @@ <h1 class="page-header">Contact Us
<!-- Content Row -->
<div class="row">
<!-- Map Column -->
<div class="col-md-8">
<div class="col-8">
<!-- Embedded Google Map -->
<iframe width="100%" height="400px" frameborder="0" scrolling="no" marginheight="0" marginwidth="0"
src="http://maps.google.com/maps?hl=en&amp;ie=UTF8&amp;ll=44.973358,-93.232486&amp;spn=56.506174,79.013672&amp;t=m&amp;z=18&amp;output=embed"></iframe>
</div>
<!-- Contact Details Column -->
<div class="col-md-4">
<div class="col-4">
<h3>CSBIO Lab</h3>
<p>
Molecular and Cellular Biology Building<br>Minneapolis, MN 55455<br>
</p>
<p><i class="fa fa-phone"></i>
<abbr title="Phone">P</abbr>: (612)-625-8089 </p>
<p><i class="fa fa-envelope-o"></i>
<abbr title="Email">E</abbr>: <a href="mailto:name@example.com">name@example.umn.edu</a>
<abbr title="Email">E</abbr>: <a href="mailto:chadm@umn.edu">chadm@umn.edu</a>
</p>
</div>
</div>
Expand Down
Binary file added images/ProfilePhotos/DanielChang.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 images/ProfilePhotos/Eric.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.
0 images/ProfilePhotos/Mafuz.jpg → images/ProfilePhotos/Mahfuz.jpg
View file
File renamed without changes
4 changes: 3 additions & 1 deletion js/header.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ var html = "" +
" <li class='nav-item'>" +
" <a class='nav-link' href='/software.html'>Software</a>" +
" </li>" +
" <li class='nav-item'>" +
" <a class='nav-link' href='/contact.html'>Contact us</a>" +
" </li>" +
" <li class='nav-item dropdown'>" +
" <a href='#' class='nav-link dropdown-toggle' data-toggle='dropdown' id='dropdownMenuLink' role='button' aria-haspopup='true' aria-expanded='false'>" +
" Other Pages" +
Expand All @@ -28,7 +31,6 @@ var html = "" +
" <a class='dropdown-item' href='/LabMemberArea/LabMemberArea.html'>Lab Member Area</a>" +
" <a class='dropdown-item' href='/collaborators.html'>Collaborators</a>" +
" <a class='dropdown-item' href='/positions.html'>Positions</a>" +
" <a class='dropdown-item' href='/contact.html'>Contact us</a>" +
" </div>" +
" </li>" +
" </ul>" +
Expand Down
40 changes: 35 additions & 5 deletions people.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ <h3 class="card-title">
<a href="https://www.linkedin.com/in/chad-myers-a2807b3"><i class="fab fa-2x fa-linkedin"></i></a>
<a href="https://scholar.google.com/citations?user=yKHrbV4AAAAJ&hl=en"><i
class="fab fa-2x fa-google"></i></a>
<a href="chadm@umn.edu"><i class="far fa-2x fa-envelope"></i></a>
</div>
</div>
</div>
Expand All @@ -109,6 +110,7 @@ <h3 class="card-title">Maximilian Billmann<br><small>Post-Doc</small></h3>
<a href="https://twitter.com/maxbillmann"><i class="fab fa-2x fa-twitter"></i></a>
<a href="https://scholar.google.co.uk/citations?user=KBnTE9sAAAAJ&hl=en&oi=ao"><i
class="fab fa-2x fa-google"></i></a>
<a href="mbillman@umn.edu"><i class="far fa-2x fa-envelope"></i></a>
</div>
</div>
</div>
Expand All @@ -120,6 +122,7 @@ <h3 class="card-title">Wen Wang<br><small>Post-Doc</small></h3>
<a href="https://www.linkedin.com/in/wen-wang-a1094514"><i class="fab fa-2x fa-linkedin"></i></a>
<a href="https://scholar.google.com/citations?user=ecWpuBsAAAAJ&hl=en"><i
class="fab fa-2x fa-google"></i></a>
<a href="wwang@umn.edu"><i class="far fa-2x fa-envelope"></i></a>
</div>
</div>
</div>
Expand All @@ -131,19 +134,21 @@ <h3 class="card-title">Hamid Safizadeh<br><small>Ph.D. Candidate</small></h3>
<a href="https://www.linkedin.com/in/hamid-safizadeh-22208b53"><i class="fab fa-2x fa-linkedin"></i></a>
<a href="https://scholar.google.com/citations?hl=en&user=j2oaa5cAAAAJ&view_op=list_works"><i
class="fab fa-2x fa-google"></i></a>
<a href="hamid@umn.edu"><i class="far fa-2x fa-envelope"></i></a>
</div>
</div>
</div>
</div>
<div class="row mb-4 pb-0">
<div class="col-3 text-center">
<div class="card h-100">
<img class="card-img-top" src="images/ProfilePhotos/Mafuz.jpg" alt="" style="max-height: 200px">
<img class="card-img-top" src="images/ProfilePhotos/Mahfuz.jpg" alt="" style="max-height: 200px">
<div class="card-body">
<h3 class="card-title">AHM Mahfuzur Rahman<br><small>Ph.D. Student</small></h3>
<a href="https://www.linkedin.com/in/mahfuzur-rahman-4487ab12"><i class="fab fa-2x fa-linkedin"></i></a>
<a href="https://scholar.google.com/citations?user=gVDtmFwAAAAJ&hl=en"><i
class="fab fa-2x fa-google"></i></a>
<a href="rahma118@umn.edu"><i class="far fa-2x fa-envelope"></i></a>
</div>
</div>
</div>
Expand All @@ -153,6 +158,7 @@ <h3 class="card-title">AHM Mahfuzur Rahman<br><small>Ph.D. Student</small></h3>
<div class="card-body">
<h3 class="card-title">Timothy Kunau<br><small>Ph.D. Candidate</small></h3>
<a href="https://www.linkedin.com/in/kunau"><i class="fab fa-2x fa-linkedin"></i></a>
<a href="kunau@umn.edu"><i class="far fa-2x fa-envelope"></i></a>
</div>
</div>
</div>
Expand All @@ -163,6 +169,7 @@ <h3 class="card-title">Timothy Kunau<br><small>Ph.D. Candidate</small></h3>
<h3 class="card-title">Xiaotong Liu<br><small>Ph.D. Student</small></h3>
<a href="https://scholar.google.com/citations?user=5RE8f6AAAAAJ&hl=en"><i
class="fab fa-2x fa-google"></i></a>
<a href="liux4215@umn.edu"><i class="far fa-2x fa-envelope"></i></a>
</div>
</div>
</div>
Expand Down Expand Up @@ -199,16 +206,17 @@ <h3 class="card-title">Kevin Lin<br><small>Ph.D. Student</small></h3>
<h3 class="card-title">Ryan Lee<br><small>Ph.D. Student</small></h3>
<a href="https://scholar.google.com/citations?user=oAbSPt8AAAAJ&hl=en&oi=sra"><i
class="fab fa-2x fa-google"></i></a>
<a href="leex5085@umn.edu"><i class="far fa-2x fa-envelope"></i></a>
</div>
</div>
</div>
<div class="col-3 text-center">
<div class="card h-100">
<img class="card-img-top" src="images/ProfilePhotos/Xiang.jpg" alt="" style="max-height: 200px">
<img class="card-img-top" src="images/ProfilePhotos/DanielChang.jpg" alt="" style="max-height: 200px">
<div class="card-body">
<h3 class="card-title">Xiang Zhang<br><small>Master's Student</small></h3>
<a href="https://www.linkedin.com/in/zhang-xiang-268417141/"><i class="fab fa-2x fa-linkedin"></i></a>
<a href="zhan6668@umn.edu"><i class="far fa-2x fa-envelope"></i></a>
<h3 class="card-title">Daniel Chang<br><small>Ph.D. Student</small></h3>
<a href="https://www.linkedin.com/in/daniel-chang-401259165/"><i class="fab fa-2x fa-linkedin"></i></a>
<a href="chang682@umn.edu"><i class="far fa-2x fa-envelope"></i></a>
</div>
</div>
</div>
Expand All @@ -224,6 +232,16 @@ <h4 class="card-title">Mehrad Hajiaghabozorgi<br><small>Ph.D. Student</small></h
</div>
</div>
<div class="row mb-4 pb-0">
<div class="col-3 text-center">
<div class="card h-100">
<img class="card-img-top" src="images/ProfilePhotos/Xiang.jpg" alt="" style="max-height: 200px">
<div class="card-body">
<h3 class="card-title">Xiang Zhang<br><small>Master's Student</small></h3>
<a href="https://www.linkedin.com/in/zhang-xiang-268417141/"><i class="fab fa-2x fa-linkedin"></i></a>
<a href="zhan6668@umn.edu"><i class="far fa-2x fa-envelope"></i></a>
</div>
</div>
</div>
<div class="col-3 text-center">
<div class="card h-100">
<img class="card-img-top" src="images/ProfilePhotos/Arshia.png" alt="" style="max-height: 200px">
Expand Down Expand Up @@ -254,6 +272,18 @@ <h3 class="card-title">Michael Albrecht<br><small>Undergraduate Researcher</smal
</div>
</div>
</div>
</div>
<div class="row mb-4 pb-0">
<div class="col-3 text-center">
<div class="card h-100">
<img class="card-img-top" src="images/ProfilePhotos/Eric.jpg" alt="" style="max-height: 200px">
<div class="card-body">
<h3 class="card-title">Eric Schultz<br><small>Undergraduate Researcher</small></h3>
<a href="https://www.linkedin.com/in/eric-schultz-725043170/"><i class="fab fa-2x fa-linkedin"></i></a>
<a href="schu3565@umn.edu"><i class="far fa-2x fa-envelope"></i></a>
</div>
</div>
</div>
<div class="col-3 text-center">
<div class="card h-100">
<img class="card-img-top" src="images/ProfilePhotos/Nathaniel.jpg" alt="" style="max-height: 200px">
Expand Down

0 comments on commit 1e7f42a

Please sign in to comment.