Merge pull request #43 from KWB-R/dev

Smaller fixes
KWB-R · Jul 10, 2020 · db0631c · db0631c
2 parents c9b8508 + 9684c9c
commit db0631c
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -5,16 +5,25 @@ Repository for Generating KWB`s Publications Website based on Hugo and friends
 
 ## Build status 
 
-**1. Development**
+[![Netlify Status](https://api.netlify.com/api/v1/badges/a0eb023f-bc30-4788-bcf5-8bfb7f89a459/deploy-status)](https://app.netlify.com/sites/kwb/deploys)
 
-  + ***GitHub Pages*** (https://kwb-r.github.io/pubs): only for "dev" branch, ends with free contingent of Travis for private repos): [![Travis](https://travis-ci.com/KWB-R/pubs.svg?token=xLsqyFUTkNjVT34QzX9D&branch=dev)](https://travis-ci.com/KWB-R/pubs)
-
-  + ***Netlify*** (https://kwb.netlify.app): for "master" and "dev" as well as for
-  pull requests for both branches ("preview" mode)
+### 1. Development**
+
+***Netlify*** (https://kwb.netlify.app): for "dev" branch (https://dev--kwb.netlify.app)
+as well as for pull requests against this or "master" branch, with a "deploy-preview"
+mode feature
 
 
 **2. Production** 
 
+***Netlify***: is now used for *production*, commits to *master* will be pushed to: 
+
+https://publications.kompetenz-wasser.de/de/publications
+
+
+### Former Deploy Workflows
+
   + ***GitLab Pages*** (https://publications.kompetenz-wasser.de/publications): currently redirected to KWB subdomain, otherwise: https://kwb-r.gitlab.io/pubs (CI-build: https://gitlab.com/KWB-R/pubs/-/pipelines)
-
-  + ***Netlify***: shoud be used after internal "beta-testing" also als *production* system (need to redirect subdomain https://publications.kompetenz-wasser.de/publications)
+
+  + ***GitHub Pages*** (https://kwb-r.github.io/pubs): only for "dev" branch, ends with free contingent of Travis for private repos): [![Travis](https://travis-ci.com/KWB-R/pubs.svg?token=xLsqyFUTkNjVT34QzX9D&branch=dev)](https://travis-ci.com/KWB-R/pubs)
+
diff --git a/content/de/home/people.md b/content/de/home/people.md
@@ -5,7 +5,7 @@
 widget = "people"  # See https://sourcethemes.com/academic/docs/page-builder/
 headless = true  # This file represents a page section.
 active = true  # Activate this widget? true/false
-weight = 68  # Order that this section will appear.
+weight = 65  # Order that this section will appear.
 
 title = "Meet the Team"
 subtitle = ""

diff --git a/content/de/home/projects.md b/content/de/home/projects.md
@@ -3,7 +3,7 @@
 widget = "portfolio"  # See https://sourcethemes.com/academic/docs/page-builder/
 headless = true  # This file represents a page section.
 active = true  # Activate this widget? true/false
-weight = 65  # Order that this section will appear.
+weight = 68  # Order that this section will appear.
 
 title = "Projects"
 subtitle = ""

diff --git a/content/en/home/people.md b/content/en/home/people.md
@@ -5,7 +5,7 @@
 widget = "people"  # See https://sourcethemes.com/academic/docs/page-builder/
 headless = true  # This file represents a page section.
 active = true  # Activate this widget? true/false
-weight = 68  # Order that this section will appear.
+weight = 65  # Order that this section will appear.
 
 title = "Meet the Team"
 subtitle = ""

diff --git a/content/en/home/projects.md b/content/en/home/projects.md
@@ -3,7 +3,7 @@
 widget = "portfolio"  # See https://sourcethemes.com/academic/docs/page-builder/
 headless = true  # This file represents a page section.
 active = true  # Activate this widget? true/false
-weight = 65  # Order that this section will appear.
+weight = 68  # Order that this section will appear.
 
 title = "Projects"
 subtitle = ""

diff --git a/content/en/publication/_index.md b/content/en/publication/_index.md
@@ -1,5 +1,5 @@
 ---
-title: Publikationen
+title: Publications
 
 # View.
 #   1 = List