Merge pull request #44 from jhudsl/cansavvy/ottr-rebrand

OTTR rebrand
jhudsl · Feb 28, 2024 · b083a4b · b083a4b
2 parents b6addb0 + d744743
commit b083a4b
Show file tree

Hide file tree

Showing 269 changed files with 6,732 additions and 26,910 deletions.
diff --git a/.github/.DS_Store b/.github/.DS_Store
diff --git a/.github/workflows/pull_request.yml b/.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

diff --git a/.github/workflows/render-site.yml b/.github/workflows/render-site.yml
@@ -63,11 +63,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
@@ -83,7 +78,6 @@ jobs:
           git config --local user.email "[email protected]"
           git config --local user.name "GitHub Actions"
           git add --force *.html
-          git add --force subdir_html/*.html
           git add --force site_libs/*
           git commit -m 'Render site' || echo "No changes to commit"
           git push origin main || echo "No changes to push"
diff --git a/_site.yml b/_site.yml
@@ -1,8 +1,9 @@
 name: Open-source Tools for Training Resources
-output_dir: '.'
+output_dir: 'docs'
 navbar:
+  title: OTTR <img src="./resources/images/basic_otter_water.PNG" width = 10px>
   left:
-  - text: "About OTTR"
+  - text: ""
     href: index.html
     icon: fa-home
   - text: "Getting Started"
@@ -12,59 +13,33 @@ navbar:
       - text: "Prerequisites"
         href: getting_started.html#prerequisites-for-using-ottr
         icon: fa-asterisk
-      - text: "Starting a new OTTR course"
+      - text: "Starting a new OTTR course/website"
         href: getting_started.html#starting-a-new-ottr-course
         icon: fa-flag-checkered
-      - text: "Start writing content"
-        href: writing_content.html
-        icon: fa-pen
-        menu:
-        - text: "Choosing a writing method"
-          href: writing_content.html
-          icon: fa-pen
-        - text: "Entry Level"
-          href: writing_content.html#ottr-entry-level
-          icon: fa-circle
-        - text: "Advanced"
-          href: writing_content.html#ottr-advanced
-          icon: fa-square
-        - text: "Set up images"
-          href: writing_content.html#set-up-images
-          icon: fa-images
-  - text: "OTTR Course Creation"
+  - text: "OTTR Website"
+    href: editing_website.html
+    icon: fa-pen
+  - text: "OTTR Courses"
     href: examples.html
     icon: fa-lightbulb
     menu:
-      - text: "OTTR course examples"
-        href: examples.html#ottr-course-examples
-        icon: fa-book
-      - text: "Choosing between platforms"
-        href: examples.html#choosing-publishing-platforms
+      - text: "Start writing!"
+        href: writing_content.html
+        icon: fa-pen
+      - text: "Set up images"
+        href: writing_content_courses.html#set-up-images
+        icon: fa-images
+      - text: "Choosing course publishing platforms"
+        href: course_publishing.html#choosing-publishing-platforms
         icon: fa-tasks
-      - text: "OTTR spinoff babies"
-        href: examples.html#ottr-spinoff-babies
-        icon: glyphicon-baby-formula
-        menu:
-          - text: "What is an OTTR baby"
-            href: examples.html#ottr-spinoff-babies
-          - text: "OTTR for websites"
-            href: examples.html#ottr-website
-          - text: "OTTR for AnVIL"
-            href: examples.html#anvil-template
-          - text: "OTTR for DataTrail"
-            href: examples.html#datatrail-template
-      - text: "Publishing"
-        icon: glyphicon-share
-        menu:
-            - text: "Publishing with Bookdown"
-              href: examples.html#publishing-with-bookdown
-            - text: "Publishing with Leanpub"
-              href: examples.html#publishing-with-leanpub
-            - text: "Publishing with Coursera"
-              href: examples.html#publishing-with-coursera
-  - text: "Customization"
-    href: customizing.html
-    icon: fa-palette
+      - text: "Publishing with Bookdown"
+        href: course_publishing.html#publishing-with-bookdown
+      - text: "Publishing with Leanpub"
+        href: course_publishing.html#publishing-with-leanpub
+      - text: "Publishing with Coursera"
+        href: course_publishinghtml#publishing-with-coursera
+  - text: "About"
+    icon:
     menu:
       - text: "Customizing Checks"
         href: customize-robots.html
@@ -75,42 +50,35 @@ navbar:
       - text: "Customizing Docker"
         href: customize-docker.html
         icon: fa-gears
-  - text: "More features"
-    href: faqs.html
-    icon: fa-plus
-    menu:
-        - text: "Citing sources"
-          href: more_features.html#citing-sources
-          icon: fa-quote-left
-        - text: "Giving credits"
-          href: more_features.html#giving-credits-to-contributors
-          icon: fa-award
-        - text: "Borrowing chapters"
-          href: more_features.html#borrowing-chapters
-          icon: fa-bookmark
-        - text: "Compatibility with Google Docs"
-          href: more_features.html#compatibility-with-google-docs
-          icon: fa-file
-        - text: "Google Analytics"
-          href: more_features.html#google-analytics
-          icon: fa-chart-line
-        - text: OTTR-fying an existing repository
-          href: ottr-fy.html
-          icon: glyphicon-sunglasses
-          #icon: fa-otter # when bookdown gets updated hopefuly will have this
+      - text: "Citing sources"
+        href: more_features.html#citing-sources
+        icon: fa-quote-left
+      - text: "Giving credits"
+        href: more_features.html#giving-credits-to-contributors
+        icon: fa-award
+      - text: "Borrowing chapters"
+        href: more_features.html#borrowing-chapters
+        icon: fa-bookmark
+      - text: "Compatibility with Google Docs"
+        href: more_features.html#compatibility-with-google-docs
+        icon: fa-file
+      - text: "Google Analytics"
+        href: more_features.html#google-analytics
+        icon: fa-chart-line
+      - text: OTTR-fying an existing repository
+        href: ottr-fy.html
+        icon: glyphicon-sunglasses
+      - text: "About OTTR babies"
+        href: examples.html
   - text: "Help"
     href: faqs.html
     icon: fa-handshake
-  - text: "GitHub"
+  - text: ""
     href: https://github.com/jhudsl/OTTR_Template
     icon: fa-github
-  - text: "Feedback"
-    icon: fa-comment
-    href: https://forms.gle/jvFjnhqt5V1E9LbQ9
 
 output:
   html_document:
     css: style.css
     includes:
-      in_header: resources/header.html
       after_body: resources/footer.html