From 5660d1b560c163db7fea305a7963c4a70c6ac74e Mon Sep 17 00:00:00 2001
From: Marco Bernasocchi <marco@opengis.ch>
Date: Thu, 7 Sep 2023 15:04:26 +0200
Subject: [PATCH] Fix academia signup flow

---
 academia.html | 13 +++++++--
 faq.html      | 78 +++++++++++++++++++++++++--------------------------
 2 files changed, 48 insertions(+), 43 deletions(-)

diff --git a/academia.html b/academia.html
index 78f6bd2..105990b 100644
--- a/academia.html
+++ b/academia.html
@@ -72,10 +72,17 @@ <h1 class="display-4">Academia account request</h1>
         data collection, analysis, and collaboration, enabling students and educators to work together more efficiently
         than ever before.
       </p>
+      <p>
+        With the academia plan your institution gets the equivalent of the organization plan but with unlimited users included; storage is available in two sizes with the following prices:
+                <ul><li>10 GB ➝ Flat rate 300€/year</li>
+                <li>50 GB ➝ Flat rate 900€/year</li>
+                </ul>
+      </p>
+      <p>To apply for an academia plan, please have your institution representative fill out the form below</p>
 
       <iframe id="request-form" class="clickup-embed clickup-dynamic-height"
-        src="https://forms.clickup.com/2192114/f/22wqj-26861/SXDO4DU4L23G2F7WGA?setup_fee=150" onwheel="" width="100%" height="100%"
-        style="background: transparent; border: 1px solid #ccc"></iframe>
+        src="https://forms.clickup.com/2192114/f/22wqj-26861/SXDO4DU4L23G2F7WGA?setup_fee=150" onwheel="" width="100%"
+        height="100%" style="background: transparent; border: 1px solid #ccc"></iframe>
 
       <script async src="https://app-cdn.clickup.com/assets/js/forms-embed/v1.js"></script>
     </div>
@@ -124,4 +131,4 @@ <h1 class="display-4">Academia account request</h1>
   <script src="./js/main.js"></script>
 </body>
 
-</html>
+</html>
\ No newline at end of file
diff --git a/faq.html b/faq.html
index 98b4c14..cd52957 100644
--- a/faq.html
+++ b/faq.html
@@ -526,39 +526,6 @@ <h5 class="mb-0">
               </div>
             </div>
           </div>
-          <div class="card">
-            <div class="card-header" id="heading14">
-              <h5 class="mb-0">
-                <button
-                  class="btn btn-link"
-                  data-toggle="collapse"
-                  data-target="#collapse14"
-                  aria-expanded="false"
-                  aria-controls="collapse14"
-                >
-                  Is there a discount on QFieldCloud subscriptions for
-                  charities?
-                </button>
-              </h5>
-            </div>
-
-            <div
-              id="collapse14"
-              class="collapse"
-              aria-labelledby="heading14"
-              data-parent="#accordion"
-            >
-              <div class="card-body">
-                We don't have a fixed discount for charities, non-profit
-                organisations and academia yet; please get in touch with us to
-                explain what you do and what you need.
-
-                <br /><span class="badge badge-primary">#qfieldcloud</span>
-                <span class="badge badge-primary">billing</span>
-                <span class="badge badge-primary">#sales</span>
-              </div>
-            </div>
-          </div>
           <div class="card">
             <div class="card-header" id="heading15">
               <h5 class="mb-0">
@@ -1055,6 +1022,39 @@ <h5 class="mb-0">
               </div>
             </div>
           </div>
+          <div class="card">
+            <div class="card-header" id="heading14">
+              <h5 class="mb-0">
+                <button
+                  class="btn btn-link"
+                  data-toggle="collapse"
+                  data-target="#collapse14"
+                  aria-expanded="false"
+                  aria-controls="collapse14"
+                >
+                  Is there a discount on QFieldCloud subscriptions for
+                  charities?
+                </button>
+              </h5>
+            </div>
+
+            <div
+              id="collapse14"
+              class="collapse"
+              aria-labelledby="heading14"
+              data-parent="#accordion"
+            >
+              <div class="card-body">
+                We don't have a fixed discount for charities or non-profit
+                organisations yet; please get in touch with us to
+                explain what you do and what you need.
+
+                <br /><span class="badge badge-primary">#qfieldcloud</span>
+                <span class="badge badge-primary">billing</span>
+                <span class="badge badge-primary">#sales</span>
+              </div>
+            </div>
+          </div>
           <div class="card">
             <div class="card-header" id="heading30">
               <h5 class="mb-0">
@@ -1077,13 +1077,11 @@ <h5 class="mb-0">
               data-parent="#accordion"
             >
               <div class="card-body">
-                Yes, there is a discount plan for Academia use of QFieldCloud.
-
-                The price will be the same as the organization plan but with unlimited users for free; storage is available only in 2 sizes:
-                10 GB ➝ Flat rate 300€/year
-                50 GB ➝ Flat rate 900€/year
-
-                <br /><span class="badge badge-primary">#qfieldcloud</span>
+                Yes, we take academic usage very seriously, that is why we offer a full-blown heavily discounted package with all options included.
+                <br/>
+                For pricing details and to apply for an academia plan, please refer to the <a href="/academia.html">academia page</a>
+                <br />
+                <span class="badge badge-primary">#qfieldcloud</span>
                 <span class="badge badge-primary">collaboration</span>
                 <span class="badge badge-primary">#plans</span>
               </div>