Skip to content

Commit 1a0dff5

Browse files
owlangowlang
authored
Merge pull request #4 from CEGRcode/yep_update
Facelift of website. Merge in Ying's new website version and design
2 parents eaf238d + 31a48cb commit 1a0dff5

26 files changed

Lines changed: 6115 additions & 614 deletions

‎README.md‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Pugh Lab Website at Cornell.
33

44
From a web technology standpoint this is built using [jekyll](https://jekyllrb.com/). Even though there are other static site generators
55
that can be deployed and hosted on GitHub, we chose [jekyll](https://jekyllrb.com/) as it is natively supported by GitHub, easy to learn,
6-
easy to integrate and configure DNS services, both GitHub and [jekyll](https://jekyllrb.com/) built using the same programming language
6+
easy to integrate and configure DNS services, both GitHub and [jekyll](https://jekyllrb.com/) built using the same programming language
77
[ruby](https://www.ruby-lang.org/en/) and also it is free to host among other things.
88

99
> Note: Even though it is based on ruby, we will not be writing any code in ruby.
@@ -14,7 +14,7 @@ easy to integrate and configure DNS services, both GitHub and [jekyll](https://j
1414
- Now install [jekyll](https://github.com/CEGRcode/cegrcode.github.io.git) itself.
1515

1616
> Note: This [step-by-step tutorial](https://jekyllrb.com/docs/step-by-step/01-setup/) covers all the basic concepts in building sites with jekyll. Highly recommend
17-
going though it on your local machine for fun. Takes about ~1hr.
17+
going though it on your local machine for fun. Takes about ~1hr.
1818

1919
### Local development
2020

@@ -23,11 +23,9 @@ going though it on your local machine for fun. Takes about ~1hr.
2323
- To view your changes type in the below command in your terminal from the root directory.
2424
- `bundle exec jekyll serve`
2525
- This should launch the website locally, usually at `http://localhost:4000/` you do not need MAMP, WAMP or any other platform for developement or production.
26-
27-
### Deployment
2826

29-
- `git push` or `merging` into to the `main` branch of this repo will automatically build and deploy your changes to production. These changes should be visible
27+
### Deployment
28+
- `git push` or `merging` into to the `main` branch of this repo will automatically build and deploy your changes to production. These changes should be visible
3029
within a few minutes depending on time taken by GitHub to process it.
3130
- `CNAME` file contains the DNS entry.
3231
- `.gitignore` is setup to ignore all temporary files generated during local development. Feel free to add others if you need to.
33-

‎_includes/footer.html‎

Lines changed: 60 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,63 @@
1-
<div class="d-flex justify-content-between align-items-center">
2-
<small class="d-block mb-3 text-muted" id="copyright"></small>
3-
<a class="text-muted" href="https://github.com/PrashantKuntala" title="built on Jekyll"><small class="d-block mb-3 text-muted"> Designed with <i class="far fa-heart"></i> by prashant kuntala </small></a>
4-
</div>
1+
2+
<section id="footer">
3+
<div class="container-footer">
4+
<div class="row">
5+
6+
<div class="col-xs-12 col-sm-12 col-md-3">
7+
<h1>Join Us !</h1>
8+
<p style="font-size: 14px">
9+
We are looking for Undergrad and grad students!
10+
</p>
11+
<p style="font-size: 14px">
12+
460A, 215 Tower Rd, Ithaca, NY 14853 Cornell University.
13+
</p>
14+
<small class="d-block mb-3" id="copyright" style="color: white;"></small>
15+
<span>
16+
<a class="social-icons" href="{{ site.github }}"
17+
><i class="fab fa-github" style="color: rgb(255, 255, 255)"></i
18+
></a>
19+
<a class="social-icons" href="{{ site.twitter }}"
20+
><i class="fab fa-twitter" style="color: rgb(255, 255, 255)"></i
21+
></a>
22+
</span>
23+
</ul>
24+
</div>
25+
26+
<div class="col-xs-12 col-sm-12 col-md-3">
27+
</div>
28+
29+
<div class="col-xs-12 col-sm-12 col-md-3 link-container">
30+
<h5>Navigation</h5>
31+
<ul class="list-unstyled quick-links">
32+
<li><a class="footer-links" href="index.html">Home</a></li>
33+
<li><a class="footer-links" href="group.html">Group</a></li>
34+
<li><a class="footer-links" href="publications.html">Publications
35+
</a></li>
36+
<li><a class="footer-links" href="resources.html">Resources
37+
</a></li>
38+
<li><a class="footer-links" href="positions.html">Positions
39+
</a></li>
40+
41+
</ul>
42+
</div>
43+
44+
<div class="col-xs-12 col-sm-12 col-md-3 link-container">
45+
<h5>Other Tools We Develop</h5>
46+
<ul class="list-unstyled quick-links">
47+
<li><a class="footer-links" href="https://github.com/CEGRcode/scriptmanager">ScriptManager</a></li>
48+
<li><a class="footer-links" href="https://github.com/seqcode/pegr">PEGR</li>
49+
<li><a class="footer-links" href="https://github.com/CEGRcode/stencil">STENCIL</li>
50+
<li><a class="footer-links" href="https://github.com/CEGRcode/GenoPipe">GenoPipe
51+
</a></li>
52+
</ul>
53+
</div>
54+
55+
</div>
56+
57+
</section>
558

659
<script>
7-
var dt = new Date();
8-
document.getElementById('copyright').innerHTML = "&copy; " + dt.getFullYear() + " Pugh Lab"
60+
var dt = new Date();
61+
document.getElementById("copyright").innerHTML =
62+
"&copy; " + dt.getFullYear() + " Pugh Lab";
963
</script>

‎_includes/header.html‎

Lines changed: 28 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,32 @@
11
<div class="container">
22
<header class="py-3">
3-
<div class="row flex-nowrap align-items-center">
4-
<div class="col-6 text-left">
5-
<h1><a class="blog-header-logo text-dark" href="/">Pugh Lab</a></h1>
6-
<p>Department of Molecular Biology and Genetics
7-
<br> <span>Cornell University</span>
8-
<br>
9-
<span>
10-
<a class="social-icons" href="{{ site.github }}"><i class="fab fa-github"></i></a>
11-
<a class="social-icons" href="{{ site.twitter }}"><i class="fab fa-twitter"></i></a>
12-
</span>
13-
</p>
14-
</div>
15-
<div class="col">
16-
</div>
17-
<div class="col-5">
18-
<img src="../assets/images/cornell_logo.svg" alt="cornell red logo" width="100%" height="auto">
19-
</div>
3+
<img class="bg-img" src="assets/images/background_image.jpg" />
4+
<div class="row flex-nowrap align-items-center header-content">
5+
<div class="col-6 text-left">
6+
<h1><a class="blog-header-logo" href="/">Pugh Lab</a></h1>
7+
<p>
8+
Department of Molecular Biology and Genetics <br />
9+
<span>Cornell University</span>
10+
<br />
11+
<span>
12+
<a class="social-icons" href="{{ site.github }}"
13+
><i class="fab fa-github" style="color: white"></i
14+
></a>
15+
<a class="social-icons" href="{{ site.twitter }}"
16+
><i class="fab fa-twitter" style="color: white"></i
17+
></a>
18+
</span>
19+
</p>
2020
</div>
21-
</header>
21+
<div class="col"></div>
22+
<div class="col-5">
23+
<img
24+
class="cornell-logo float-end"
25+
src="../assets/images/cornell_logo_simple_white.svg"
26+
alt="cornell red logo"
27+
height="auto"
28+
/>
29+
</div>
30+
</div>
31+
</header>
2232
</div>

‎_includes/mainSlideShow.html‎

Lines changed: 60 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1,90 +1,96 @@
1-
<div class="rounded my-3">
2-
3-
<!-- Slideshow container -->
4-
<div class="slideshow-container">
5-
6-
<!-- Full-width images with number and caption text -->
1+
<div class="rounded my-3">
2+
<!-- Slideshow container -->
3+
<div class="slideshow-container">
4+
<!-- Full-width images with number and caption text -->
75
<div class="mySlides">
8-
<!-- <div class="numbertext">1 / 4</div> -->
9-
<img src="/assets/images/slide1.png" class="slide-images">
10-
<!-- <div class="text">Caption Text</div> -->
6+
<img
7+
src="assets/images/211208HolidayParty Unicorns.jpg"
8+
class="slide-images"
9+
/>
10+
<!-- <div class="numbertext">1 / 4</div>
11+
<img src="/assets/images/slide1.png" class="slide-images" />
12+
<div class="text">Caption Text</div> -->
1113
</div>
1214

1315
<div class="mySlides">
1416
<!-- <div class="numbertext">2 / 4</div> -->
15-
<img src="/assets/images/slide2.png" class="slide-images">
17+
<!-- <img src="/assets/images/slide2.png" class="slide-images" /> -->
18+
<img src="assets/images/IMG_8865.jpg" class="slide-images" />
1619
<!-- <div class="text">Caption Two</div> -->
1720
</div>
1821

1922
<div class="mySlides">
2023
<!-- <div class="numbertext">3 / 4</div> -->
21-
<img src="/assets/images/slide3.png" class="slide-images">
24+
<img src="assets/images/IMG_4744.jpg" class="slide-images" />
25+
<!-- <img src="/assets/images/slide3.png" class="slide-images" /> -->
2226
<!-- <div class="text">Caption Three</div> -->
2327
</div>
2428
<div class="mySlides">
2529
<!-- <div class="numbertext">4 / 4</div> -->
26-
<img src="/assets/images/slide4.png" class="slide-images">
30+
<!-- <img src="/assets/images/slide4.png" class="slide-images" /> -->
31+
<img src="assets/images/IMG_8785.jpg" class="slide-images" />
2732
<!-- <div class="text">Caption Text</div> -->
2833
</div>
2934

30-
3135
<!-- Next and previous buttons -->
3236
<a class="prev" onclick="plusSlides(-1)">&#10094;</a>
3337
<a class="next" onclick="plusSlides(1)">&#10095;</a>
34-
</div>
38+
</div>
3539

36-
<!-- The dots/circles -->
37-
<div style="text-align:center">
40+
<!-- The dots/circles -->
41+
<div style="text-align: center">
3842
<span class="dot" onclick="currentSlide(1)"></span>
3943
<span class="dot" onclick="currentSlide(2)"></span>
4044
<span class="dot" onclick="currentSlide(3)"></span>
4145
<span class="dot" onclick="currentSlide(4)"></span>
42-
</div>
43-
46+
</div>
4447
</div>
4548

4649
<script type="text/javascript">
47-
var slideIndex = 1;
48-
showSlides(slideIndex);
50+
var slideIndex = 1;
51+
showSlides(slideIndex);
4952

50-
function plusSlides(n) {
51-
showSlides(slideIndex += n);
52-
}
53+
function plusSlides(n) {
54+
showSlides((slideIndex += n));
55+
}
5356

54-
function currentSlide(n) {
55-
showSlides(slideIndex = n);
56-
}
57+
function currentSlide(n) {
58+
showSlides((slideIndex = n));
59+
}
5760

58-
function showSlides(n) {
59-
var i;
60-
var slides = document.getElementsByClassName("mySlides");
61-
var dots = document.getElementsByClassName("dot");
62-
if (n > slides.length) {slideIndex = 1}
63-
if (n < 1) {slideIndex = slides.length}
64-
for (i = 0; i < slides.length; i++) {
61+
function showSlides(n) {
62+
var i;
63+
var slides = document.getElementsByClassName("mySlides");
64+
var dots = document.getElementsByClassName("dot");
65+
if (n > slides.length) {
66+
slideIndex = 1;
67+
}
68+
if (n < 1) {
69+
slideIndex = slides.length;
70+
}
71+
for (i = 0; i < slides.length; i++) {
6572
slides[i].style.display = "none";
66-
}
67-
for (i = 0; i < dots.length; i++) {
73+
}
74+
for (i = 0; i < dots.length; i++) {
6875
dots[i].className = dots[i].className.replace(" active", "");
76+
}
77+
slides[slideIndex - 1].style.display = "block";
78+
dots[slideIndex - 1].className += " active";
6979
}
70-
slides[slideIndex-1].style.display = "block";
71-
dots[slideIndex-1].className += " active";
72-
}
73-
7480

75-
// Automatic slideshow
76-
// var slideIndex = 0;
77-
// showSlides();
78-
//
79-
// function showSlides() {
80-
// var i;
81-
// var slides = document.getElementsByClassName("mySlides");
82-
// for (i = 0; i < slides.length; i++) {
83-
// slides[i].style.display = "none";
84-
// }
85-
// slideIndex++;
86-
// if (slideIndex > slides.length) {slideIndex = 1}
87-
// slides[slideIndex-1].style.display = "block";
88-
// setTimeout(showSlides, 3000); // Change image every 3 seconds
89-
// }
81+
// Automatic slideshow
82+
// var slideIndex = 0;
83+
// showSlides();
84+
//
85+
// function showSlides() {
86+
// var i;
87+
// var slides = document.getElementsByClassName("mySlides");
88+
// for (i = 0; i < slides.length; i++) {
89+
// slides[i].style.display = "none";
90+
// }
91+
// slideIndex++;
92+
// if (slideIndex > slides.length) {slideIndex = 1}
93+
// slides[slideIndex-1].style.display = "block";
94+
// setTimeout(showSlides, 3000); // Change image every 3 seconds
95+
// }
9096
</script>

‎_includes/navigation.html‎

Lines changed: 32 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
<nav class="nav d-flex align-items-center">
2-
<!--iterate over each item in the _data/navigation.yml file-->
1+
<!-- <nav class="nav d-flex align-items-center">
2+
iterate over each item in the _data/navigation.yml file
33
{% for item in site.data.navigation %}
44
<a href="{{ item.link }}"
55
{% if page.url == item.link %}
@@ -8,7 +8,33 @@
88
{{ item.name }}
99
</a>
1010
{% endfor %}
11-
</nav>
12-
13-
14-
11+
</nav> -->
12+
<nav class="navbar navbar-expand-lg">
13+
<div class="container-fluid">
14+
<img class="lab_logo" src="assets/images/lablogo.svg">
15+
<button
16+
class="navbar-toggler"
17+
type="button"
18+
data-bs-toggle="collapse"
19+
data-bs-target="#navbarNav"
20+
aria-controls="navbarNav"
21+
aria-expanded="false"
22+
aria-label="Toggle navigation"
23+
>
24+
<span class="navbar-toggler-icon"></span>
25+
</button>
26+
<div class="collapse navbar-collapse justify-content-end" id="navbarNav">
27+
<ul class="navbar-nav">
28+
{% for item in site.data.navigation %}
29+
<li class="nav-item"><a href="{{ item.link }}"
30+
{% if page.url == item.link %}
31+
class="current"
32+
{% endif %}>
33+
{{ item.name }}
34+
</a>
35+
</li>
36+
{% endfor %}
37+
</ul>
38+
</div>
39+
</div>
40+
</nav>

0 commit comments

Comments
 (0)