Merge branch 'develop' into 'master'

Develop

See merge request !18

.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

archetypes/sc_data.md

@@ -7,6 +7,7 @@ draft: true
 weight: ""
 type: "custom"
 layout: ""
+current: true
 ---
 
 **PENDING**
\ No newline at end of file

config.toml

-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

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

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

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

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
 ---
 

content/sc.data/hu.donor.pr.shallow.md

@@ -7,5 +7,6 @@ draft: true
 weight: "2"
 type: "custom"
 layout: "hu.donor.shallow"
+current: false
 ---
 

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

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

layouts/custom/people.html

-{{ 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

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>