Merge branch 'main' into feature/FIND-75-new-accordion-style-to-searc…

…h-filters
nationalarchives · Nov 25, 2024 · 3b8c66b · 3b8c66b
2 parents fef289b + 58a8d17
commit 3b8c66b
Show file tree

Hide file tree

Showing 3 changed files with 57 additions and 5 deletions.
diff --git a/.github/workflows/deploy-docs.yml b/.github/workflows/deploy-docs.yml
@@ -0,0 +1,48 @@
+name: Deploy Docs
+
+on:
+  push:
+    branches:
+      - main
+
+permissions:
+  contents: read
+  actions: read
+  pages: write
+  id-token: write
+
+concurrency:
+  group: "pages"
+  cancel-in-progress: false
+
+jobs:
+  build-and-deploy:
+    name: Build and deploy
+    runs-on: ubuntu-latest
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: 3.12
+      - name: Install dependencies
+        run: pip install -r requirements.txt
+      - name: Check links
+        run: |
+          pip install linkcheckmd
+          python -m linkcheckmd docs -v
+      - name: Build
+        run: mkdocs build
+      - name: Setup Pages
+        uses: actions/configure-pages@v4
+      - name: Upload artifact
+        uses: actions/upload-pages-artifact@v3
+        with:
+          path: site
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v4
diff --git a/app/templates/records/record_detail.html b/app/templates/records/record_detail.html
@@ -1,11 +1,12 @@
 {% extends 'base.html' %}
 
+{%- set pageTitle = page_title -%}
 
 {% block content %}
 <div class="tna-section">
   <div class="tna-container">
     <div class="tna-column tna-column--width-2-3 tna-column--width-5-6-medium tna-column--full-small tna-column--full-tiny">
-      <h1 class="tna-heading-xl">{{ page_title }}</h1>
+      <h1 class="tna-heading-xl">{{ pageTitle }}</h1>
     </div>
   </div>
 </div>

diff --git a/config/settings/develop.py b/config/settings/develop.py
@@ -11,12 +11,15 @@
 
 FORCE_HTTPS = strtobool(os.getenv("FORCE_HTTPS", "False"))
 
-DJANGO_SERVE_STATIC = True
+DJANGO_SERVE_STATIC = strtobool(os.getenv("DJANGO_SERVE_STATIC", "True"))
 
 if not DEBUG and DJANGO_SERVE_STATIC:
-    STATICFILES_STORAGE = (
-        "django.contrib.staticfiles.storage.StaticFilesStorage"
-    )
+    STORAGES = {
+        "staticfiles": {
+            "BACKEND": "django.contrib.staticfiles.storage.StaticFilesStorage",
+        }
+    }
+
 
 if DEBUG: