Merge pull request #57 from jhudsl/cansavvy/add-numbering

Add numbering to tabs

.github/workflows/pull_request.yml

@@ -37,7 +37,7 @@ jobs:
           git checkout -b $branch_name || echo branch exists
           git push --set-upstream origin $branch_name
         shell: bash
-        
+
     outputs:
       public_repository: "${{ steps.public_repository.outputs.public }}"
       toggle_spell_check: "${{ env.SPELL_CHECK }}"
@@ -102,11 +102,6 @@ jobs:
         id: site
         run: Rscript -e "rmarkdown::render_site()"
 
-      # We may have html files that we want to render to add as links on the pages -these will be stored in a dir called subdir_html
-      - name: Render subdir_html
-        id: subdir_html
-        run: Rscript -e "for (i in list.files(path = './subdir_html', pattern = 'Rmd$', recursive = TRUE, full.names = TRUE)){rmarkdown::render(i)}"
-
       # This checks on the steps before it and makes sure that they completed.
       # If the renders didn't complete we don't want to commit the file changes
       - name: Check on render steps
@@ -140,7 +135,7 @@ jobs:
         id: build-components
         run: |
           course_name=$(head -n 1 _website.yml | cut -d'"' -f 2| tr " " "-")
-          website_link=$(echo "https://htmlpreview.github.io/?https://raw.githubusercontent.com/$GITHUB_REPOSITORY/preview-${{ github.event.pull_request.number }}/index.html")
+          website_link=$(echo "https://htmlpreview.github.io/?https://raw.githubusercontent.com/$GITHUB_REPOSITORY/preview-${{ github.event.pull_request.number }}/docs/index.html")
           echo ::set-output name=website_link::$website_link
           echo ::set-output name=time::$(date +'%Y-%m-%d')
           echo ::set-output name=commit_id::$GITHUB_SHA

.github/workflows/render-site.yml

@@ -15,7 +15,6 @@ on:
       - '**.Rmd'
       - styles.css
       - _site.yml
-      - subdir_html/*.Rmd
       - resources/images/*.png
       - resources/images/favicon.ico
       - site_libs/*
@@ -63,11 +62,6 @@ jobs:
         id: site
         run: Rscript -e "rmarkdown::render_site()"
 
-      # We may have html files that we want to render to add as links on the pages -these will be stored in a dir called subdir_html
-      - name: Render subdir_html
-        id: subdir_html
-        run: Rscript -e "for (i in list.files(path = './subdir_html', pattern = 'Rmd$', recursive = TRUE, full.names = TRUE)){rmarkdown::render(i)}"
-
       # This checks on the steps before it and makes sure that they completed.
       # If the renders didn't complete we don't want to commit the file changes
       - name: Check on render steps
@@ -82,8 +76,7 @@ jobs:
           git config --system --add safe.directory $GITHUB_WORKSPACE
           git config --local user.email "actions@github.com"
           git config --local user.name "GitHub Actions"
-          git add --force *.html
-          git add --force subdir_html/*.html
+          git add --force docs/*
           git add --force site_libs/*
           git commit -m 'Render site' || echo "No changes to commit"
           git push origin main || echo "No changes to push"

_site.yml

@@ -1,26 +1,23 @@
 name: OTTR Template Website
-output_dir: '.'
+output_dir: 'docs'
 navbar:
   title: OTTR Web
   left:
-  - text: Home
+  - text: ""
     href: index.html
     icon: fa-home
-  - text: Setup
+  - text: 1. Setup
     href: setup.html
-  - text: Hosting
+  - text: 2. Hosting
     href: hosting.html
   - text: Editing
     href: editing.html
-  - text: Style
+  - text: 3. Style
     href: style.html
-  - text: Git Actions
+  - text: 4. Git Actions
     href: git_actions.html
-  - text: Docker
-    href: docker.html
-  - text: Contact
-    href: contact.html
-    icon: fa-envelope
+  - text: More ottr docs
+    href: https://www.ottrproject.org/
 
 
 output: