From a747d446bd52b3d079d93f6c38a9f1fbf41ea210 Mon Sep 17 00:00:00 2001
From: jangorecki <j.gorecki@wit.edu.pl>
Date: Tue, 29 Oct 2019 13:29:54 +0530
Subject: [PATCH] pkgdown, keep manual tab, link cranlike page, minor rename

---
 .gitlab-ci.yml |  2 +-
 _pkgdown.yml   | 18 ++++++++++++------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c7698a51a3..43ddf537a0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -309,7 +309,7 @@ integration: # merging all artifacts to produce single R repository and summarie
     # web/checks/check_results_$pkg.html
     - Rscript -e 'check.index("data.table", names(test.jobs))'
     # pkgdown merge
-    - Rscript -e 'common_files<-function(path1, path2) intersect(list.files(path1, all.files=TRUE, no..=TRUE), list.files(path2, all.files=TRUE, no..=TRUE)); if (length(f<-common_files("pkgdown","bus/integration/cran"))) message(paste(c("Following artifacts will be overwritten by pkgdown artifacts:", paste0("  ", f)), collapse="\n")); q("no")'
+    - Rscript -e 'common_files<-function(path1, path2) intersect(list.files(path1, all.files=TRUE, no..=TRUE), list.files(path2, all.files=TRUE, no..=TRUE)); msg = if (length(f<-common_files("pkgdown","bus/integration/cran"))) paste(c("Following artifacts will be overwritten by pkgdown artifacts:", paste0("  ", f)), collapse="\n") else "No overlapping files from pkgdown artifacts"; message(msg); q("no")'
     - mv pkgdown/* bus/integration/cran/
     # cleanup artifacts from other jobs
     - mkdir tmpbus
diff --git a/_pkgdown.yml b/_pkgdown.yml
index 09a21c6e83..6d2ef397d3 100644
--- a/_pkgdown.yml
+++ b/_pkgdown.yml
@@ -7,9 +7,14 @@ template:
 development:
   version_tooltip: "Development version"
 
+home:
+  links:
+  - text: CRAN-like website
+    href: web/packages/data.table/index.html
+
 navbar:
   structure:
-    left:  [home, introduction, vignettes, news, benchmarks, presentations, articles]
+    left:  [home, introduction, articles, news, benchmarks, presentations, communityarticles, reference]
     right: [github]
   components:
     home:
@@ -18,7 +23,7 @@ navbar:
     introduction:
       text: Introduction
       href: articles/datatable-intro.html
-    vignettes:
+    articles:
       text: Vignettes
       menu:
       - text: "Introduction to data.table"
@@ -39,10 +44,8 @@ navbar:
         href: articles/datatable-importing.html
       - text: "Benchmarking data.table"
         href: articles/datatable-benchmarking.html
-      - text: Reference manual
-        href: reference/index.html
     news:
-      text: Changelog
+      text: News
       href: news/index.html
     benchmarks:
       text: Benchmarks
@@ -50,9 +53,12 @@ navbar:
     presentations:
       text: Presentations
       href: https://github.com/Rdatatable/data.table/wiki/Presentations
-    articles:
+    communityarticles:
       text: Articles
       href: https://github.com/Rdatatable/data.table/wiki/Articles
+    reference:
+      text: Manual
+      href: reference/index.html
     github:
       icon: fab fa-github fa-lg
       href: https://github.com/Rdatatable/data.table