Fix: Our Goals content, pagination, download link | Add: Link to doc sections on home imgs

templates/download.html

@@ -6,11 +6,13 @@
 
 {% block content %}
   <section id="download-section" class="section">
-    <div class="mx-auto max-w-7xl py-12">
+    <div class="relative w-full py-8 flex flex-col items-center justify-center bg-gray-50 shadow-sm">
-        <div class="flex flex-col items-center justify-center">
+        <h1 class="text-garage-orange font-bold text-2xl text-center">Download</h1>
-            <h1 class="text-garage-orange font-bold text-2xl text-center">Garage releases</h1>
+        <div class="absolute -bottom-8 left-1/2 transform -translate-x-1/2 w-16 overflow-hidden inline-block">
-            <div class="my-4 h-1 w-16 bg-garage-orange"></div>
+            <div class="h-8 w-8 bg-gradient-to-bl from-gray-50 via-gray-50 to-gray-100 -rotate-45 transform origin-top-left shadow"></div>
         </div>
+    </div>
+    <div class="mx-auto max-w-7xl px-8 xl:px-0">
         <div id="releases-container" class="py-24 space-y-20">
             <div id="release-builds">
                 <h2 class="text-garage-gray text-xl font-semibold">Release Builds</h2>
@@ -90,7 +92,6 @@
                     <div id="release-builds-source-${i}" class="flex items-center pt-4 space-x-2">
                         <span>Sources</span>
                         <a href="https://git.deuxfleurs.fr/Deuxfleurs/garage/src/tag/${releaseBuilds[i]['version']}" class="inline-block p-1.5 text-garage-gray font-bold bg-gray-300 hover:bg-orange-300 rounded border-b-2 border-gray-400 hover:border-orange-400 transition-all duration-300">
-                            <svg class="inline w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M7 16a4 4 0 01-.88-7.903A5 5 0 1115.9 6L16 6a5 5 0 011 9.9M9 19l3 3m0 0l3-3m-3 3V10"></path></svg>
                             <span>Gitea</span>
                         </a>
                         <a href="https://git.deuxfleurs.fr/Deuxfleurs/garage/archive/${releaseBuilds[i]['version']}.zip" class="inline-block p-1.5 text-garage-gray font-bold bg-gray-300 hover:bg-orange-300 rounded border-b-2 border-gray-400 hover:border-orange-400 transition-all duration-300">
@@ -109,7 +110,6 @@
                     window['buildDetail' + i] =
                     `
                     <a href="${releaseBuilds[i]['builds'][j]['path']}" class="inline-block p-1.5 text-garage-gray font-bold bg-gray-300 hover:bg-orange-300 rounded border-b-2 border-gray-400 hover:border-orange-400 transition-all duration-300">
-                        <svg class="inline w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M7 16a4 4 0 01-.88-7.903A5 5 0 1115.9 6L16 6a5 5 0 011 9.9M9 19l3 3m0 0l3-3m-3 3V10"></path></svg>
                         <span>
                             ${releaseBuilds[i]['builds'][j]['platform']
                             .replace('aarch64-unknown-linux-musl', 'linux/arm64')
@@ -138,7 +138,6 @@
                     <div id="extra-builds-source-${i}" class="flex items-center pt-4 space-x-2">
                         <span>Sources</span>
                         <a href="https://git.deuxfleurs.fr/Deuxfleurs/garage/src/tag/${extraBuilds[i]['version']}" class="inline-block p-1.5 text-garage-gray font-bold bg-gray-300 hover:bg-orange-300 rounded border-b-2 border-gray-400 hover:border-orange-400 transition-all duration-300">
-                            <svg class="inline w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M7 16a4 4 0 01-.88-7.903A5 5 0 1115.9 6L16 6a5 5 0 011 9.9M9 19l3 3m0 0l3-3m-3 3V10"></path></svg>
                             <span>Gitea</span>
                         </a>
                         <a href="https://git.deuxfleurs.fr/Deuxfleurs/garage/archive/${extraBuilds[i]['version']}.zip" class="inline-block p-1.5 text-garage-gray font-bold bg-gray-300 hover:bg-orange-300 rounded border-b-2 border-gray-400 hover:border-orange-400 transition-all duration-300">
@@ -157,7 +156,6 @@
                     window['buildDetail' + i] =
                     `
                     <a href="${extraBuilds[i]['builds'][j]['path']}" class="inline-block p-1.5 text-garage-gray font-bold bg-gray-300 hover:bg-orange-300 rounded border-b-2 border-gray-400 hover:border-orange-400 transition-all duration-300">
-                        <svg class="inline w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M7 16a4 4 0 01-.88-7.903A5 5 0 1115.9 6L16 6a5 5 0 011 9.9M9 19l3 3m0 0l3-3m-3 3V10"></path></svg>
                         <span>
                             ${extraBuilds[i]['builds'][j]['platform']
                             .replace('aarch64-unknown-linux-musl', 'linux/arm64')
@@ -186,7 +184,6 @@
                     <div id="development-builds-source-${i}" class="flex items-center pt-4 space-x-2">
                         <span>Sources</span>
                         <a href="https://git.deuxfleurs.fr/Deuxfleurs/garage/src/tag/${developmentBuilds[i]['version']}" class="inline-block p-1.5 text-garage-gray font-bold bg-gray-300 hover:bg-orange-300 rounded border-b-2 border-gray-400 hover:border-orange-400 transition-all duration-300">
-                            <svg class="inline w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M7 16a4 4 0 01-.88-7.903A5 5 0 1115.9 6L16 6a5 5 0 011 9.9M9 19l3 3m0 0l3-3m-3 3V10"></path></svg>
                             <span>Gitea</span>
                         </a>
                         <a href="https://git.deuxfleurs.fr/Deuxfleurs/garage/archive/${developmentBuilds[i]['version']}.zip" class="inline-block p-1.5 text-garage-gray font-bold bg-gray-300 hover:bg-orange-300 rounded border-b-2 border-gray-400 hover:border-orange-400 transition-all duration-300">
@@ -205,7 +202,6 @@
                     window['buildDetail' + i] =
                     `
                     <a href="${developmentBuilds[i]['builds'][j]['path']}" class="inline-block p-1.5 text-garage-gray font-bold bg-gray-300 hover:bg-orange-300 rounded border-b-2 border-gray-400 hover:border-orange-400 transition-all duration-300">
-                        <svg class="inline w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M7 16a4 4 0 01-.88-7.903A5 5 0 1115.9 6L16 6a5 5 0 011 9.9M9 19l3 3m0 0l3-3m-3 3V10"></path></svg>
                         <span>
                             ${developmentBuilds[i]['builds'][j]['platform']
                             .replace('aarch64-unknown-linux-musl', 'linux/arm64')

templates/index.html

@@ -10,7 +10,7 @@
       <p class="text-gray-500 leading-10 pt-4 text-xl text-center">{{ config.extra.organization.description }}</p>
       <div class="flex items-center justify-center space-x-2 md:space-x-4 py-4">
         <a
-          href="https://garagehq.deuxfleurs.fr/_releases.html"
+          href="{{ config.base_url }}/download/"
           title="Garage releases"
           class="group flex items-center justify-center space-x-1 font-semibold shadow hover:shadow-lg px-4 py-3 rounded text-white transition-all duration-500 bg-gradient-to-tl from-garage-orange via-orange-500 to-orange-300 bg-size-200 bg-pos-0 hover:bg-pos-100">
           <svg class="w-6 h-6 animate-pulse" fill="none" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M7 16a4 4 0 01-.88-7.903A5 5 0 1115.9 6L16 6a5 5 0 011 9.9M9 19l3 3m0 0l3-3m-3 3V10"></path></svg>
@@ -25,18 +25,18 @@
         </a>
       </div>
       <div class="max-w-7xl mx-auto grid grid-cols-1 md:grid-cols-3 gap-x-32 py-12">
-          <div class="group flex flex-col items-center justify-center p-2">
+          <a href="{{config.base_url}}/documentation/connect/websites/" class="group flex flex-col items-center justify-center p-2">
             <img src="{{ get_url(path='images/host.png') }}" class="transform group-hover:translate-y-2 transition duration-500">
             <span class="text-xl text-gray-700 font-semibold mt-4 transform group-hover:-translate-y-1 transition duration-500 whitespace-nowrap">Host a Website</span>
-          </div>
+          </a>
-          <div class="group flex flex-col items-center justify-center p-2">
+          <a href="{{config.base_url}}/documentation/connect/apps/" class="group flex flex-col items-center justify-center p-2">
             <img src="{{ get_url(path='images/store.png') }}" class="transform group-hover:translate-y-2 transition duration-500">
             <span class="text-xl text-gray-700 font-semibold mt-4 transform group-hover:-translate-y-1 transition duration-500 whitespace-nowrap">Store Media</span>
-          </div>
+          </a>
-          <div class="group flex flex-col items-center justify-center p-2">
+          <a href="{{config.base_url}}/documentation/connect/backup/" class="group flex flex-col items-center justify-center p-2">
             <img src="{{ get_url(path='images/backup.png') }}" class="transform group-hover:translate-y-2 transition duration-500">
             <span class="text-xl text-gray-700 font-semibold mt-4 transform group-hover:-translate-y-1 transition duration-500 whitespace-nowrap">Backup Target</span>
-          </div>
+          </a>
       </div>
     </div>
 
@@ -70,23 +70,27 @@
         <div class="w-8 h-1 bg-garage-orange"></div>
         <p class="text-center leading-5 italic">We made it lightweight and kept the efficiency in mind:</p>
         <ul class="list-style-none font-semibold flex flex-col items-center justify-center py-4">
-          <li class="py-1.5">
+          <li class="py-1.5 flex flex-col items-center justify-center">
-            As self-contained as possible
+            <span>Self-contained</span>
+            <p class="font-normal text-center">We ship a single dependency-free binary that runs on all Linux distributions</p>
           </li>
           <div class="w-2 h-2 rounded-full bg-garage-orange"></div>
-          <li class="py-1.5">
+          <li class="py-1.5 flex flex-col items-center justify-center">
-            Easy to set up
+            <span>Fast to deploy, safe to operate</span>
+            <p class="font-normal text-center">We are sysadmin, we know the value of operator friendly software</p>
           </li>
           <div class="w-2 h-2 rounded-full bg-garage-orange"></div>
-          <li class="py-1.5">
+          <li class="py-1.5 flex flex-col items-center justify-center">
-            Made for multi-datacenter deployments
+            <span>Deploy everywhere on every machine</span>
+            <p class="font-normal text-center">We do not have a dedicated backbone, neither do you,<br>
+              so we made a software that run over the Internet across multiple datacenter</p>
           </li>
           <div class="w-2 h-2 rounded-full bg-garage-orange"></div>
-          <li class="py-1.5 text-center">
+          <li class="py-1.5 flex flex-col items-center justify-center text-center">
-            Highly resilient to<br>
+            Highly resilient<br>
             <div class="font-normal">
-              <span>network failures</span>,
+              <span>to network failures</span>,
-              <span>network latency</span><br>
+              <span>network latency</span>,
               <span>disk failures</span>,
               <span>sysadmin failures</span>
             </div>
@@ -190,15 +194,15 @@
         </p>
         <ul class="text-center list-style-none flex flex-col items-center py-4">
           <li>
-            <a href="https://dl.acm.org/doi/abs/10.1145/1323293.1294281" class="font-semibold hover:text-garage-orange">Dynamo: Amazon’s Highly Available Key-value Store</a>
+            <a target="_blank" href="https://dl.acm.org/doi/abs/10.1145/1323293.1294281" class="font-semibold hover:text-garage-orange">Dynamo: Amazon’s Highly Available Key-value Store</a>
             by DeCandia et al.
           </li>
           <li>
-            <a href="https://hal.inria.fr/inria-00609399v1" class="font-semibold hover:text-garage-orange">Conflict-Free Replicated Data Types</a>
+            <a target="_blank" href="https://hal.inria.fr/inria-00609399v1" class="font-semibold hover:text-garage-orange">Conflict-Free Replicated Data Types</a>
             by Shapiro et al.
           </li>
           <li>
-            <a href="https://www.usenix.org/conference/nsdi16/technical-sessions/presentation/eisenbud" class="font-semibold hover:text-garage-orange">Maglev: A Fast and Reliable Software Network Load Balancer</a>
+            <a target="_blank" href="https://www.usenix.org/conference/nsdi16/technical-sessions/presentation/eisenbud" class="font-semibold hover:text-garage-orange">Maglev: A Fast and Reliable Software Network Load Balancer</a>
             by Eisenbud et al.
           </li>
         </ul>
@@ -208,16 +212,15 @@
     <div class="w-full flex flex-col items-center justify-center shadow-inner"></div>
       <div class="px-8 py-24 space-y-8 text-garage-gray max-w-4xl mx-auto">
         <h2 class="text-2xl text-garage-orange font-semibold">Sponsors and funding</h2>
-        <p>
+        <p>The <a class="text-garage-orange underline" href="https://deuxfleurs.fr/" target="_blank">Deuxfleurs association</a>
-          The <a class="text-garage-orange underline" href="https://deuxfleurs.fr/" target="_blank">Deuxfleurs association</a>
           has received a grant from <a class="text-garage-orange underline" href="https://pointer.ngi.eu/" target="_blank">NGI POINTER</a>,
-          to fund 3 people working on Garage full-time for a year : from October 2021 to September 2022.
+          to fund 3 people working on Garage full-time for a year : from October 2021 to September 2022.</p>
-        </p>
+        <p>If you want to fund Garage development past its initial grant,
+          either through donation or support contract,
+          please <a class="text-garage-orange underline" href="mailto:{{config.extra.social.email}}">get in touch with us</a></p>  
         <img src="{{ get_url(path='images/ngi-pointer-eu.png') }}" class="w-2/3 mx-auto" alt="NGI Pointers">
-        <p class="italic">
+        <p class="italic">This project has received funding from the European Union's Horizon 2021 research and innovation programme
-          This project has received funding from the European Union's Horizon 2021 research and innovation programme
+          within the framework of the NGI-POINTER Project funded under grant agreement N° 871528.</p>
-          within the framework of the NGI-POINTER Project funded under grant agreement N° 871528.
-        </p>
       </div>
     </div>
 

templates/partials/shared/nav.html

@@ -33,7 +33,7 @@
                     </svg>
                 </a>
                 <a
-                    href="https://garagehq.deuxfleurs.fr/_releases.html"
+                    href="{{ config.base_url }}/download/"
                     title="Garage releases"
                     class="group flex items-center justify-center space-x-1 font-semibold shadow hover:shadow px-2 py-1.5 rounded text-white transition-all duration-500 bg-gradient-to-tl from-garage-orange via-orange-500 to-orange-300 bg-size-200 bg-pos-0 hover:bg-pos-100">
                     <svg class="w-6 h-6 animate-pulse" fill="none" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M7 16a4 4 0 01-.88-7.903A5 5 0 1115.9 6L16 6a5 5 0 011 9.9M9 19l3 3m0 0l3-3m-3 3V10"></path></svg>

templates/partials/shared/paginator.html

@@ -17,7 +17,7 @@
                 {% for pager in range(start=1, end=paginator.number_pagers+1) %}
                 <li>
                     <a class="font-semibold inline-flex items-center justify-center h-7 w-7 rounded hover:shadow hover:bg-garage-orange bg-garage-gray bg-opacity-20 border-b-2 {% if paginator.current_index == pager %}border-garage-orange{% else %}border-transparent{% endif %}"
-                        href='{{ paginator.base_url }}{{pager}}' aria-label="Goto page {{pager}}">
+                        href='{{ paginator.base_url }}{{pager}}/' aria-label="Goto page {{pager}}">
                         {{pager}}
                     </a>
                 </li>

templates/section.html

@@ -33,10 +33,10 @@
             <p class="w-max italic text-gray-600 py-0.5 px-1.5 bg-gray-100 rounded mb-1">{{ page.description }}</p>
           {% endif %}
           <div class="flex space-x-1 text-sm py-2 bg-garage-orange bg-opacity-10 w-full p-1.5 rounded">
-            <div class="column is-8">
+            <div>
               {{ macros::page_publish_metadata(page=page) }}
             </div>
-            <div class="column is-4 has-text-right-desktop">
+            <div>
               {{ macros::page_content_metadata(page=page) }}
             </div>
           </div>
@@ -52,13 +52,13 @@
               </span>
             </a>
           </div>
-          <div class="columns">
+          <div>
-            <div class="column">
+            <div>
               {% if page.taxonomies.categories %}
                 {{ macros::render_categories(categories=page.taxonomies.categories) }}
               {% endif %}
             </div>
-            <div class="column has-text-right-desktop">
+            <div>
               {% if page.taxonomies.tags %}
                 {{ macros::render_tags(tags=page.taxonomies.tags) }}
               {% endif %}