diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a4b65b1706e50cfc21aa1d1ab931a36055fd1438..280d13700e0baa4ef2b2c321991eecbc02e38e2d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,21 +5,36 @@ before_script:
- module load singularity/3.0.2
- module load awscli
+stages:
+ - build_stage
+ - deploy_stage
+
build:
+ stage: build_stage
script:
- singularity run 'docker://monachus/hugo' hugo
artifacts:
paths:
- - public
+ - public/
+ expire_in: 1 week
+ cache:
+ paths:
+ - public/
+
+deploy.dev:
+ stage: deploy_stage
+ script:
+ - singularity run 'docker://monachus/hugo' hugo deploy aws-dev --maxDeletes -1
+ dependencies:
+ - build
only:
- develop
-deploy:
+
+deploy.live:
+ stage: deploy_stage
script:
- - singularity run 'docker://monachus/hugo' hugo
-## - singularity run 'docker://monachus/hugo' hugo deploy aws --maxDeletes -1
-## - aws s3 ls s3://www.strandlab.net/ --recursive | awk '{cmd="aws s3api put-object-acl --acl bucket-owner-full-control --bucket www.strandlab.net --key "$4; system(cmd)}'
- artifacts:
- paths:
- - public
+ - singularity run 'docker://monachus/hugo' hugo deploy aws --maxDeletes -1
+ dependencies:
+ - build
only:
- master
\ No newline at end of file
diff --git a/archetypes/sc_data.md b/archetypes/sc_data.md
index c706e22305288de018e0313ef9c3865f4a4cc6ea..190426578c75ecfd72a2e001a2df5b5ed1f4aacd 100644
--- a/archetypes/sc_data.md
+++ b/archetypes/sc_data.md
@@ -7,6 +7,7 @@ draft: true
weight: ""
type: "custom"
layout: ""
+current: true
---
**PENDING**
\ No newline at end of file
diff --git a/config.toml b/config.toml
index fc580556409ad076aafb1400883213c0bcf4718f..30941acaf677a0593973a3257c0348d447739b4f 100644
--- a/config.toml
+++ b/config.toml
@@ -1,4 +1,4 @@
-baseurl = "https://strandlab.net/"
+baseurl = "http://strandlab.dev.s3-website.us-east-2.amazonaws.com/"
title = "Strand Lab"
author = "Gervaise H. Henry"
theme = "blackburn"
@@ -19,7 +19,7 @@ paginate = 10
department = "Department of Urology"
dsite = "https://www.utsouthwestern.edu/education/medical-school/departments/urology/"
description = "Investigating lower urinary tract biology"
- googleAnalytics = "UA-120971283-2"
+ # googleAnalytics = "UA-120971283-2"
# CSS name for highlight.js
highlightjs = "androidstudio"
highlightjs_extra_languages = ["yaml"]
@@ -80,6 +80,10 @@ paginate = 10
[deployment]
order = [".jpg$", ".gif$"]
+ [[deployment.targets]]
+ name = "aws-dev"
+ URL = "s3://strandlab.dev?region=us-east-2"
+
[[deployment.targets]]
name = "aws"
URL = "s3://strandlab?region=us-east-2"
\ No newline at end of file
diff --git a/content/people/images/henry_g_hat.jpg b/content/people/images/henry_g_hat.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..f0ee8368d985c20cdee32cd9353f94217e3f66bc
Binary files /dev/null and b/content/people/images/henry_g_hat.jpg differ
diff --git a/content/people/images/strand_d_scowl.jpg b/content/people/images/strand_d_scowl.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..ecdee103d8430bbe8a76fd71b54f2c5fee69a766
Binary files /dev/null and b/content/people/images/strand_d_scowl.jpg differ
diff --git a/content/sc.data/hu.bph.pr.md b/content/sc.data/hu.bph.pr.md
index 384a8ae112fe1401a94b9ca01fe7cf76086a68a7..87ee40f318ce43862cac232f1e323a71c83ac935 100644
--- a/content/sc.data/hu.bph.pr.md
+++ b/content/sc.data/hu.bph.pr.md
@@ -7,6 +7,7 @@ draft: false
weight: "4"
type: "custom"
layout: ""
+current: false
---
**PENDING**
\ No newline at end of file
diff --git a/content/sc.data/hu.cancer.pr.md b/content/sc.data/hu.cancer.pr.md
index 0f550c262be2aefd5f336c623169d7fc24c886cb..8351df159c34072390b94c8770e1587e557f3b10 100644
--- a/content/sc.data/hu.cancer.pr.md
+++ b/content/sc.data/hu.cancer.pr.md
@@ -7,6 +7,7 @@ draft: false
weight: "5"
type: "custom"
layout: ""
+current: false
---
**PENDING**
\ No newline at end of file
diff --git a/content/sc.data/hu.donor.bl.md b/content/sc.data/hu.donor.bl.md
index 2382f54aadfe2274d0aae3bba1648fcbe5f34088..33810b4d771d94b38bb3549ac0fcd34eb4d5f1b6 100644
--- a/content/sc.data/hu.donor.bl.md
+++ b/content/sc.data/hu.donor.bl.md
@@ -7,6 +7,7 @@ draft: false
weight: "3"
type: "custom"
layout: ""
+current: false
---
**PENDING**
\ No newline at end of file
diff --git a/content/sc.data/hu.donor.pr.deep.md b/content/sc.data/hu.donor.pr.deep.md
index 60727655e9e0204c705fc5d5ba0911a7e1e3500d..dc9d2838f0e1a6a4e863e1cee844c11a83c46117 100644
--- a/content/sc.data/hu.donor.pr.deep.md
+++ b/content/sc.data/hu.donor.pr.deep.md
@@ -7,5 +7,7 @@ draft: false
weight: "1"
type: "custom"
layout: "hu.donor.deep"
+current: true
+current: true
---
diff --git a/content/sc.data/hu.donor.pr.shallow.md b/content/sc.data/hu.donor.pr.shallow.md
index 8ff1d8ae1bcc308679e1beed45a46bda74a95f2a..14a0ef9f4b13bdc6e0814dda4891118a20549a65 100644
--- a/content/sc.data/hu.donor.pr.shallow.md
+++ b/content/sc.data/hu.donor.pr.shallow.md
@@ -7,5 +7,6 @@ draft: true
weight: "2"
type: "custom"
layout: "hu.donor.shallow"
+current: false
---
diff --git a/content/sc.data/mu.bl.md b/content/sc.data/mu.bl.md
index d960ffa483420f05d480a9b17a9678c3a9d12c5b..91d318549729b25c03ff95d0bdb96b5e0ba1b10d 100644
--- a/content/sc.data/mu.bl.md
+++ b/content/sc.data/mu.bl.md
@@ -7,6 +7,7 @@ draft: false
weight: "7"
type: "custom"
layout: ""
+current: false
---
**PENDING**
\ No newline at end of file
diff --git a/content/sc.data/mu.pr.md b/content/sc.data/mu.pr.md
index a40587d169bfe4d744df2a4eb3d71c0c25e113a7..2f5bdfbf9243f04384e0cc538f9df6e790cd2149 100644
--- a/content/sc.data/mu.pr.md
+++ b/content/sc.data/mu.pr.md
@@ -7,6 +7,7 @@ draft: false
weight: "6"
type: "custom"
layout: ""
+current: false
---
**PENDING**
\ No newline at end of file
diff --git a/layouts/custom/people.html b/layouts/custom/people.html
index 9a5d26b5b7dbe664f4b1a0d0442f2156ad18a9e9..212c3b308d398f21ce2e6ade3e8102755466156c 100644
--- a/layouts/custom/people.html
+++ b/layouts/custom/people.html
@@ -1,88 +1,99 @@
-{{ partial "header.html" . }}
-
-<div class="header">
- <h1>{{ .Title }}</h1>
- <h2>{{ .Description }}</h2>
-</div>
-
-<style>
- @media (min-width: 1000px) {
- .column {
- float: left;
- }
-
- .left {
- width: 25%;
- }
-
- .right {
- width: 75%;
- }
-
- .row:after {
- content: "";
- display: table;
- clear: both;
- }
- }
-
- img.pic {
- width: 175px;
- padding: 7px;
- border: 1px solid #ddd;
- box-shadow: 4px 4px 5px #888;
- }
-</style>
-
-<div class="content">
- <div class="current">
- {{ range where .Pages.ByWeight "Params.current" true }}
- <div class="row">
- <h3><strong>{{.Params.name}} {{.Params.degree}}</strong></h3>
- <h4>{{.Params.tit}}</h4>
- {{ if not (eq .Params.orcid "") }}
- <p>
- <a href="https://orcid.org/{{.Params.orcid}}" target="_blank"><img
- src="https://orcid.org/sites/default/files/images/orcid_16x16.png">orcid.org/{{.Params.orcid}}</a>
- </p>
- {{ end }}
- <div class="column left">
- {{ if not (eq .Params.pic "") }}
- <img src="images/{{.Params.pic}}" alt="" class="pic">
- {{ end }}
- </div>
- <div class="column right" style="text-align: justify">
- <p>{{.Content}}</p>
- </div>
- </div>
- <hr><br>
- {{end}}
- </div>
- <hr>
- <h1>Former Members</h1>
- <div class="former">
- {{ range where .Pages.ByWeight "Params.current" false }}
- <div class="row">
- <h3><strong>{{.Params.name}} {{.Params.degree}}</strong></h3>
- <h4>{{.Params.tit}}</h4>
- {{ if not (eq .Params.orcid "") }}
- <p>
- <a href="https://orcid.org/{{.Params.orcid}}"><img
- src="https://orcid.org/sites/default/files/images/orcid_16x16.png">orcid.org/{{.Params.orcid}}</a>
- </p>
- {{ end }}
- <div class="column left">
- {{ if not (eq .Params.pic "") }}
- <img src="images/{{.Params.pic}}" alt="" class="pic">
- {{ end }}
- </div>
- <div class="column right" style="text-align: justify">
- <p>{{.Content}}</p>
- </div>
- </div>
- <hr><br>
- {{end}}
- </div>
-</div>
-
+{{ partial "header.html" . }}
+
+<div class="header">
+ <h1>{{ .Title }}</h1>
+ <h2>{{ .Description }}</h2>
+</div>
+
+<style>
+ @media (min-width: 1000px) {
+ .column {
+ float: left;
+ }
+
+ .left {
+ width: 25%;
+ }
+
+ .right {
+ width: 75%;
+ }
+
+ .row:after {
+ content: "";
+ display: table;
+ clear: both;
+ }
+ }
+
+ img.pic {
+ width: 175px;
+ padding: 7px;
+ border: 1px solid #ddd;
+ box-shadow: 4px 4px 5px #888;
+ }
+</style>
+
+<div class="content">
+ <div class="current">
+ {{ range where .Pages.ByWeight "Params.current" true }}
+ <div class="row">
+ <h3><strong>{{.Params.name}} {{.Params.degree}}</strong></h3>
+ <h4>{{.Params.tit}}</h4>
+ {{ if not (eq .Params.orcid "") }}
+ <p>
+ <a href="https://orcid.org/{{.Params.orcid}}" target="_blank"><img
+ src="https://orcid.org/sites/default/files/images/orcid_16x16.png">orcid.org/{{.Params.orcid}}</a>
+ </p>
+ {{ end }}
+ <div class="column left">
+ {{ if not (eq .Params.pic "") }}
+ {{ if (ne .Params.title "Henry_g") }}
+ <img src="images/{{.Params.pic}}" id={{.Params.title}} alt="" class="pic">
+ {{ end }}
+ {{ if (eq .Params.title "Henry_g") }}
+ <img src="images/{{.Params.pic}}" id={{.Params.title}} alt="" class="pic" onmouseover="changeImage({{.Params.title}}, 'images/henry_g_hat.jpg')" onmouseleave="changeImage({{.Params.title}}, 'images/{{.Params.pic}}')">
+ {{ end }}
+ {{ end }}
+ </div>
+ <div class="column right" style="text-align: justify">
+ <p>{{.Content}}</p>
+ </div>
+ </div>
+ <hr><br>
+ {{end}}
+ </div>
+ <hr>
+ <h1>Former Members</h1>
+ <div class="former">
+ {{ range where .Pages.ByWeight "Params.current" false }}
+ <div class="row">
+ <h3><strong>{{.Params.name}} {{.Params.degree}}</strong></h3>
+ <h4>{{.Params.tit}}</h4>
+ {{ if not (eq .Params.orcid "") }}
+ <p>
+ <a href="https://orcid.org/{{.Params.orcid}}"><img
+ src="https://orcid.org/sites/default/files/images/orcid_16x16.png">orcid.org/{{.Params.orcid}}</a>
+ </p>
+ {{ end }}
+ <div class="column left">
+ {{ if not (eq .Params.pic "") }}
+ <img src="images/{{.Params.pic}}" alt="" class="pic">
+ {{ end }}
+ </div>
+ <div class="column right" style="text-align: justify">
+ <p>{{.Content}}</p>
+ </div>
+ </div>
+ <hr><br>
+ {{end}}
+ </div>
+</div>
+
+<script>
+ function changeImage(id,img){
+ setTimeout(function() {document.getElementById(id).src=img;},0);
+ }
+</script>
+
{{ partial "footer.html" . }}
\ No newline at end of file
diff --git a/layouts/custom/sc.data.html b/layouts/custom/sc.data.html
index 604721f6637e9bf7a83b20493945613f49bafea5..ccda3b5510f073ce8a399c73bd99fc63e650f000 100644
--- a/layouts/custom/sc.data.html
+++ b/layouts/custom/sc.data.html
@@ -6,8 +6,15 @@
</div>
<div class="content">
- {{ range .Pages.ByWeight }}
- <li><a href="{{.Permalink}}">{{.Params.name}}</a></li>
+ <br>
+ {{ range where .Pages.ByWeight "Params.current" true }}
+ <li><b><a href="{{.Permalink}}">{{.Params.name}}</a></b></li>
+ {{ end }}
+ <br>
+ <hr>
+ <br>
+ {{ range where .Pages.ByWeight "Params.current" false }}
+ <li><i><a href="{{.Permalink}}">{{.Params.name}}</a></i></li>
{{ end }}
</div>