Merge pull request #81 from CybercentreCanada/fix_blog

Update mkdocs packages to latest
CybercentreCanada · Aug 31, 2023 · 1aa429b · 1aa429b
2 parents c3c590a + 0bcba03
commit 1aa429b
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 74 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -9,9 +9,9 @@ jobs:
   deploy:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
         with:
           python-version: 3.x
-      - run: pip install mkdocs-material==7.3.6 mkdocs-static-i18n==0.56 mkdocs-glightbox
+      - run: pip install mkdocs-material mkdocs-static-i18n mkdocs-glightbox
       - run: mkdocs gh-deploy --force
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -14,4 +14,4 @@
             }
         },
     ]
-}
+}
diff --git a/docs/blog/images/blog2.png b/docs/blog/images/blog2.png
diff --git a/docs/index.md b/docs/index.md
@@ -1,4 +1,3 @@
 ---
 template: home.html
-title: Home
 ---
diff --git a/mkdocs.yml b/mkdocs.yml
@@ -1,10 +1,10 @@
 extra:
   alternate:
   - lang: en
-    link: ./en/
+    link: /
     name: English
   - lang: fr
-    link: ./fr/
+    link: /fr/
     name: Français
 extra_css:
 - stylesheets/extra.css
@@ -177,17 +177,22 @@ plugins:
     zoomable: true
 - search
 - i18n:
-    default_language: en
+    fallback_to_default: true
     languages:
-      en: english
-      fr: français
-    nav_translations:
-      fr:
-        Developer's guide: Guide du développeur
-        Home: Accueil
-        Integration: Intégration
-        Overview: Tour
-        User's manual: Manuel d'utilisateur
+      - locale: en
+        default: true
+        name: English
+        build: true
+      - locale: fr
+        name: Français
+        build: true
+        nav_translations:
+            Developer's guide: Guide du développeur
+            Home: Accueil
+            Integration: Intégration
+            Overview: Aperçu
+            User's manual: Manuel d'utilisateur
+            Data Ontology: Ontologie des données
 repo_url: https://github.com/CybercentreCanada/assemblyline4_docs
 site_name: Assemblyline 4
 theme:
@@ -215,3 +220,6 @@ theme:
       name: Switch to dark mode
   static_templates:
   - 404.html
+validation:
+  absolute_links: ignore
+  unrecognized_links: ignore
diff --git a/override/home.html b/override/home.html
@@ -97,39 +97,27 @@
         }
     }
 
-    .md-footer-meta {
-        background-color: initial;
-        display: flex;
-    }
-
-    .md-footer-social {
-        padding-top: 20px;
-    }
-
-    .md-footer-social__link svg {
-        max-height: 20px;
-    }
-
     .md-button-group {
         display: flex;
         flex-wrap: wrap;
     }
 
-    .md-button.button-discord {
+    .md-button.button-icon {
         width: fit-content;
         gap: 10px;
         fill: var(--md-primary-bg-color);
         transition: fill 125ms, background-color 125ms, border-color 125ms;
     }
 
-    .md-button.button-discord:hover {
+    .md-button.button-icon:hover,
+    .md-button.button-icon:focus {
         fill: var(--md-default-bg-color);
     }
 
-    .discord {
+    .icon {
         display: grid;
         text-align: center;
-        width: 38px;
+        width: 24px;
     }
 </style>
 
@@ -146,17 +134,21 @@ <h1>Assemblyline 4</h1>
                     meilleurs outils de la communauté en cyber sécurité!{%else%}A scalable file triage and malware
                     analysis system integrating the cyber security community's best tools.{%endif%}</p>
                 <div class="md-button-group">
-                    <a href="{{ page.next_page.url | url }}" title="{{ page.next_page.title | striptags }}"
+                    <a href="overview/how_it_works/"
+                        title="{%if 'fr/' in page.url %}Comment ça fonctionne{%else%}How it works{%endif%}"
                         class="md-button md-button--primary">
-                        {{ page.next_page.title | striptags }}
+                        {%if 'fr/' in page.url %}Comment ça fonctionne{%else%}How it works{%endif%}
                     </a>
                     <a href="https://github.com/search?q=topic%3Aassemblyline+org%3ACybercentreCanada+fork%3Atrue"
-                        title="{{ lang.t('source.link.title') }}" class="md-button">
-                        {{ lang.t('source.link.title') }}
+                        title="{%if 'fr/' in page.url %}Voir le code source{%else%}View source code{%endif%}"
+                        class="md-button button-icon" target="_blank">
+                        <span>{%if 'fr/' in page.url %}Voir le code source{%else%}View source code{%endif%}</span>
+                        <span class="icon">{% include ".icons/fontawesome/brands/github.svg" %}</span>
                     </a>
-                    <a href="https://discord.gg/GUAy9wErNu" class="md-button button-discord">
-                        <span>{%if 'fr/' in page.url %}Rejoignez notre communauté{%else%}Join our community{%endif%}</span>
-                        <span class="discord">{% include ".icons/fontawesome/brands/discord.svg" %}</span>
+                    <a href="https://discord.gg/GUAy9wErNu" target="_blank" class="md-button button-icon">
+                        <span>{%if 'fr/' in page.url %}Rejoignez notre communauté{%else%}Join our
+                            community{%endif%}</span>
+                        <span class="icon">{% include ".icons/fontawesome/brands/discord.svg" %}</span>
                     </a>
                 </div>
             </div>
@@ -166,36 +158,3 @@ <h1>Assemblyline 4</h1>
 
 {% endblock %}
 {% block content %}{% endblock %}
-{% block footer %}
-<footer class="md-footer">
-    <div class="md-footer-meta md-typeset">
-        <div class="md-footer-meta__inner md-grid">
-            <div class="md-footer-social">
-                <a class="md-footer-social__link"
-                    href="https://github.com/search?q=topic%3Aassemblyline+org%3ACybercentreCanada+fork%3Atrue"
-                    rel="noopener" target="_blank" title="github.com">
-                    <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 496 512">
-                        <path
-                            d="M165.9 397.4c0 2-2.3 3.6-5.2 3.6-3.3.3-5.6-1.3-5.6-3.6 0-2 2.3-3.6 5.2-3.6 3-.3 5.6 1.3 5.6 3.6zm-31.1-4.5c-.7 2 1.3 4.3 4.3 4.9 2.6 1 5.6 0 6.2-2s-1.3-4.3-4.3-5.2c-2.6-.7-5.5.3-6.2 2.3zm44.2-1.7c-2.9.7-4.9 2.6-4.6 4.9.3 2 2.9 3.3 5.9 2.6 2.9-.7 4.9-2.6 4.6-4.6-.3-1.9-3-3.2-5.9-2.9zM244.8 8C106.1 8 0 113.3 0 252c0 110.9 69.8 205.8 169.5 239.2 12.8 2.3 17.3-5.6 17.3-12.1 0-6.2-.3-40.4-.3-61.4 0 0-70 15-84.7-29.8 0 0-11.4-29.1-27.8-36.6 0 0-22.9-15.7 1.6-15.4 0 0 24.9 2 38.6 25.8 21.9 38.6 58.6 27.5 72.9 20.9 2.3-16 8.8-27.1 16-33.7-55.9-6.2-112.3-14.3-112.3-110.5 0-27.5 7.6-41.3 23.6-58.9-2.6-6.5-11.1-33.3 2.6-67.9 20.9-6.5 69 27 69 27 20-5.6 41.5-8.5 62.8-8.5s42.8 2.9 62.8 8.5c0 0 48.1-33.6 69-27 13.7 34.7 5.2 61.4 2.6 67.9 16 17.7 25.8 31.5 25.8 58.9 0 96.5-58.9 104.2-114.8 110.5 9.2 7.9 17 22.9 17 46.4 0 33.7-.3 75.4-.3 83.6 0 6.5 4.6 14.4 17.3 12.1C428.2 457.8 496 362.9 496 252 496 113.3 383.5 8 244.8 8zM97.2 352.9c-1.3 1-1 3.3.7 5.2 1.6 1.6 3.9 2.3 5.2 1 1.3-1 1-3.3-.7-5.2-1.6-1.6-3.9-2.3-5.2-1zm-10.8-8.1c-.7 1.3.3 2.9 2.3 3.9 1.6 1 3.6.7 4.3-.7.7-1.3-.3-2.9-2.3-3.9-2-.6-3.6-.3-4.3.7zm32.4 35.6c-1.6 1.3-1 4.3 1.3 6.2 2.3 2.3 5.2 2.6 6.5 1 1.3-1.3.7-4.3-1.3-6.2-2.2-2.3-5.2-2.6-6.5-1zm-11.4-14.7c-1.6 1-1.6 3.6 0 5.9 1.6 2.3 4.3 3.3 5.6 2.3 1.6-1.3 1.6-3.9 0-6.2-1.4-2.3-4-3.3-5.6-2z">
-                        </path>
-                    </svg> </a>
-                <a class="md-footer-social__link" href="https://groups.google.com/g/cse-cst-assemblyline" rel="noopener"
-                    target="_blank" title="Google Groups">
-                    <svg fill="#000000" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
-                        <path
-                            d="M 1 0 L 1 18 L 16 18 L 23 24 L 23 0 Z M 12 4 C 13.101563 4 14 4.898438 14 6 C 14 7.101563 13.101563 8 12 8 C 10.898438 8 10 7.101563 10 6 C 10 4.898438 10.898438 4 12 4 Z M 7 12.300781 L 7 13 L 4 13 C 4 13 4 12.898438 4 12.601563 C 4 12.199219 4.699219 11.199219 6.5 11.199219 C 6.800781 11.199219 7.101563 11.199219 7.300781 11.300781 C 7.101563 11.601563 7 12 7 12.300781 Z M 6.5 10 C 5.699219 10 5 9.300781 5 8.5 C 5 7.699219 5.699219 7 6.5 7 C 7.300781 7 8 7.699219 8 8.5 C 8 9.300781 7.300781 10 6.5 10 Z M 16 13 L 8 13 C 8 13 8 12.898438 8 12.300781 C 8 11.699219 9.101563 10 12 10 C 14.898438 10 16 11.699219 16 12.300781 C 16 12.898438 16 13 16 13 Z M 16 8.5 C 16 7.699219 16.699219 7 17.5 7 C 18.300781 7 19 7.699219 19 8.5 C 19 9.300781 18.300781 10 17.5 10 C 16.699219 10 16 9.300781 16 8.5 Z M 20 13 L 17 13 L 17 12.300781 C 17 12 16.898438 11.601563 16.699219 11.199219 C 17 11.101563 17.199219 11.101563 17.5 11.101563 C 19.300781 11.101563 20 12.199219 20 12.5 C 20 12.898438 20 13 20 13 Z" />
-                    </svg>
-                </a>
-                <a class="md-footer-social__link" href="https://discord.gg/GUAy9wErNu" rel="noopener" target="_blank"
-                    title="Community Discord">
-                    <svg fill="#000000" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 50 50">
-                        <path
-                            d="M 41.625 10.769531 C 37.644531 7.566406 31.347656 7.023438 31.078125 7.003906 C 30.660156 6.96875 30.261719 7.203125 30.089844 7.589844 C 30.074219 7.613281 29.9375 7.929688 29.785156 8.421875 C 32.417969 8.867188 35.652344 9.761719 38.578125 11.578125 C 39.046875 11.867188 39.191406 12.484375 38.902344 12.953125 C 38.710938 13.261719 38.386719 13.429688 38.050781 13.429688 C 37.871094 13.429688 37.6875 13.378906 37.523438 13.277344 C 32.492188 10.15625 26.210938 10 25 10 C 23.789063 10 17.503906 10.15625 12.476563 13.277344 C 12.007813 13.570313 11.390625 13.425781 11.101563 12.957031 C 10.808594 12.484375 10.953125 11.871094 11.421875 11.578125 C 14.347656 9.765625 17.582031 8.867188 20.214844 8.425781 C 20.0625 7.929688 19.925781 7.617188 19.914063 7.589844 C 19.738281 7.203125 19.34375 6.960938 18.921875 7.003906 C 18.652344 7.023438 12.355469 7.566406 8.320313 10.8125 C 6.214844 12.761719 2 24.152344 2 34 C 2 34.175781 2.046875 34.34375 2.132813 34.496094 C 5.039063 39.605469 12.972656 40.941406 14.78125 41 C 14.789063 41 14.800781 41 14.8125 41 C 15.132813 41 15.433594 40.847656 15.621094 40.589844 L 17.449219 38.074219 C 12.515625 36.800781 9.996094 34.636719 9.851563 34.507813 C 9.4375 34.144531 9.398438 33.511719 9.765625 33.097656 C 10.128906 32.683594 10.761719 32.644531 11.175781 33.007813 C 11.234375 33.0625 15.875 37 25 37 C 34.140625 37 38.78125 33.046875 38.828125 33.007813 C 39.242188 32.648438 39.871094 32.683594 40.238281 33.101563 C 40.601563 33.515625 40.5625 34.144531 40.148438 34.507813 C 40.003906 34.636719 37.484375 36.800781 32.550781 38.074219 L 34.378906 40.589844 C 34.566406 40.847656 34.867188 41 35.1875 41 C 35.199219 41 35.210938 41 35.21875 41 C 37.027344 40.941406 44.960938 39.605469 47.867188 34.496094 C 47.953125 34.34375 48 34.175781 48 34 C 48 24.152344 43.785156 12.761719 41.625 10.769531 Z M 18.5 30 C 16.566406 30 15 28.210938 15 26 C 15 23.789063 16.566406 22 18.5 22 C 20.433594 22 22 23.789063 22 26 C 22 28.210938 20.433594 30 18.5 30 Z M 31.5 30 C 29.566406 30 28 28.210938 28 26 C 28 23.789063 29.566406 22 31.5 22 C 33.433594 22 35 23.789063 35 26 C 35 28.210938 33.433594 30 31.5 30 Z">
-                        </path>
-                    </svg>
-                </a>
-            </div>
-        </div>
-    </div>
-</footer>
-{% endblock %}