CORE-5035: restructure terms

data/terms.yml

@@ -7,51 +7,53 @@ header:
       variant: contained
       target: _blank
 main:
-  - mainItems:
-      - title: ODC-By licenced datasets
-        content: |
-          * You can use these datasets for any commercial or non-commercial purposes in line with the **ODC-By licence**.
-          * You need to acknowledge the use of CORE as [described](https://core.ac.uk/acknowledge).
-      - title: Other datasets and the API
-        content: |
-                While you need to obtain a licence to use other CORE datasets as well as the CORE API, many of our users are eligible for a free licence.
-
-                However, you should contact us, irrespective of any potential free licence eligibility as described below, if you are developing or intending to develop a product, service or software using CORE data which:
-
-                * might be monetised now or in the future **OR**
-                * is expected to serve only a restricted group of beneficiaries (e.g. only your own organisation) **OR**
-                * is intended for the benefit of everyone but related to the functionality provided by one of CORE’s existing services, such as but not limited to an API, a recommender system, search, discovery system or analytical dashboard.
-      - title: Free licence eligibility
-        content: |
-                If your use of CORE data does not fall under any of the categories mentioned in the above points 1-3 **AND** you are either an individual or a public research organisation, then you might be eligible for a free licence.
-      - title: Individuals
-        content: |
-          If you are an individual, you can use CORE data freely if:
-
-          * You are conducting work in your own personal capacity **AND**
-          * You will acknowledge the use of CORE as [described](https://core.ac.uk/acknowledge).
-  - mainItems:
-      - title: Public research organisations
-        content: |
-                If you are working for a public research organisation (e.g. a university):
-
-                You can use CORE data freely if:
-
-                * You are pursuing research on CORE data with the objective of producing a research paper or a publicly available report AND
-                * You will acknowledge the use of CORE as [described](https://core.ac.uk/acknowledge).
-
-                If you are intending to use CORE as part of a research project(s) then, unless you are a Supporting or a Sustaining Member, you should [contact us](https://core.ac.uk/about#contact) to obtain a licence. Depending on the circumstances, we will assess if you might be eligible for a free licence.
-      - title: CORE Supporting and Sustaining members
-        content: |
-          Academic institutions who are CORE Supporting and Sustaining members receive automatically a free non-commercial licence to the CORE API for any internal purposes for all of their staff and students as part of CORE Membership. CORE Sustaining members receive automatically a free non-commercial licence to the CORE API for any internal purposes for all of their staff and students as part of CORE Membership.
-      - title: Authorisation for use of your data
-        content: |
-                You authorise us to use the logo of your organisation and/or project on our website and to mention our support to you in public communication.
-
-                We reserve the right to withdraw our approval for use of CORE data at any time by giving you a **30-day** notice.
-additional:
-  title: Disclaimer
-  content: |
-          The term (*)**CORE data** refers to a database created by indexing and processing information publicly available on the Internet. Every effort has been made to ensure this dataset contains open access content only. We have included content only from repositories and journals that are listed in registries where the condition for inclusion is the provision of content under an open access compatible license. However, as metadata are often inconsistent, license information is often not machine readable and, from time to time, repositories leak information that is not open access, we cannot take any responsibility for the licences of the individual content in the dataset. It is therefore up to the user of this dataset to ensure that the way in which they use the dataset does not breach copyright of any third party. The dataset is in no way intended for the purposes of reading the original publications, but for machine processing only. <br>
-
-          Additionally, while CORE retains no copyright in any of the works in the database, we reserve the sui generis database rights. This is due to the substantial investment in obtaining, processing and serving the aggregated data to the relevant communities of interest.
+  - title: 1. ODC-By licenced datasets
+    content: |
+      * You can use these datasets for any commercial or non-commercial purposes in line with the **ODC-By licence**.
+      * You need to acknowledge the use of CORE as [described](https://core.ac.uk/acknowledge).
+  - title: 2. Other datasets and the API
+    content: |
+      While you need to obtain a licence to use other CORE datasets as well as the CORE API, many of our users are eligible for a free licence.
+
+      However, you should contact us, irrespective of any potential free licence eligibility as described below, if you are developing or intending to develop a product, service or software using CORE data which:
+
+      * might be monetised now or in the future **OR**
+      * is expected to serve only a restricted group of beneficiaries (e.g. only your own organisation) **OR**
+      * is intended for the benefit of everyone but related to the functionality provided by one of CORE’s existing services, such as but not limited to an API, a recommender system, search, discovery system or analytical dashboard.
+  - title: 2.1 Free licence eligibility
+    subtitle: "true"
+    content: |
+      If your use of CORE data does not fall under any of the categories mentioned in the above points 1-3 **AND** you are either an individual or a public research organisation, then you might be eligible for a free licence.
+  - title: 2.2 Individuals
+    subtitle: "true"
+    content: |
+      If you are an individual, you can use CORE data freely if:
+
+      * You are conducting work in your own personal capacity **AND**
+      * You will acknowledge the use of CORE as [described](https://core.ac.uk/acknowledge).
+  - title: 2.3 Public research organisations
+    subtitle: "true"
+    content: |
+      If you are working for a public research organisation (e.g. a university):
+
+      You can use CORE data freely if:
+
+      * You are pursuing research on CORE data with the objective of producing a research paper or a publicly available report AND
+      * You will acknowledge the use of CORE as [described](https://core.ac.uk/acknowledge).
+
+      If you are intending to use CORE as part of a research project(s) then, unless you are a Supporting or a Sustaining Member, you should [contact us](https://core.ac.uk/about#contact) to obtain a licence. Depending on the circumstances, we will assess if you might be eligible for a free licence.
+  - title: 2.4 CORE Supporting and Sustaining members
+    subtitle: "true"
+    content: |
+      Academic institutions who are CORE Supporting and Sustaining members receive automatically a free non-commercial licence to the CORE API for any internal purposes for all of their staff and students as part of CORE Membership. CORE Sustaining members receive automatically a free non-commercial licence to the CORE API for any internal purposes for all of their staff and students as part of CORE Membership.
+  - title: 2.5 Authorisation for use of your data
+    subtitle: "true"
+    content: |
+      You authorise us to use the logo of your organisation and/or project on our website and to mention our support to you in public communication.
+
+      We reserve the right to withdraw our approval for use of CORE data at any time by giving you a **30-day** notice.
+  - title: Disclaimer
+    content: |
+      The term (*)**CORE data** refers to a database created by indexing and processing information publicly available on the Internet. Every effort has been made to ensure this dataset contains open access content only. We have included content only from repositories and journals that are listed in registries where the condition for inclusion is the provision of content under an open access compatible license. However, as metadata are often inconsistent, license information is often not machine readable and, from time to time, repositories leak information that is not open access, we cannot take any responsibility for the licences of the individual content in the dataset. It is therefore up to the user of this dataset to ensure that the way in which they use the dataset does not breach copyright of any third party. The dataset is in no way intended for the purposes of reading the original publications, but for machine processing only. <br>
+
+      Additionally, while CORE retains no copyright in any of the works in the database, we reserve the sui generis database rights. This is due to the substantial investment in obtaining, processing and serving the aggregated data to the relevant communities of interest.

templates/term/index.jsx

@@ -1,5 +1,6 @@
 import React from 'react'
 import { Button } from '@oacore/design/lib/elements'
+import { classNames } from '@oacore/design/lib/utils'
 
 import styles from './styles.module.scss'
 import { Layout, Section } from '../../design-v2/components'
@@ -30,26 +31,20 @@ const TermsPageTemplate = ({ data }) => (
     </Section>
     <div className={styles.contentWrapper}>
       <div className={styles.contentItem}>
-        {data.main[0].mainItems.map((mainItem) => (
+        {data.main.map((mainItem) => (
           <div key={mainItem.title} className={styles.item}>
-            <h2 className={styles.mainTitle}>{mainItem.title}</h2>
-            <Markdown>{mainItem.content}</Markdown>
-          </div>
-        ))}
-      </div>
-      <div className={styles.contentItem}>
-        {data.main[1].mainItems.map((mainItem) => (
-          <div key={mainItem.title} className={styles.item}>
-            <h2 className={styles.mainTitle}>{mainItem.title}</h2>
+            <h2
+              className={classNames.use(styles.mainTitle, {
+                [styles.subTitle]: mainItem.subtitle,
+              })}
+            >
+              {mainItem.title}
+            </h2>
             <Markdown>{mainItem.content}</Markdown>
           </div>
         ))}
       </div>
     </div>
-    <div className={styles.additionalItem} id="disclaimer">
-      <h2 className={styles.mainTitle}>{data.additional.title}</h2>
-      <Markdown>{data.additional.content}</Markdown>
-    </div>
   </Layout>
 )
 export default TermsPageTemplate

templates/term/styles.module.scss

@@ -21,10 +21,8 @@
 }
 .content-wrapper {
   display: flex;
-  justify-content: space-between;
-  flex-wrap: wrap-reverse;
   .content-item {
-    width: 48%;
+    width: 100%;
     .item {
       margin-bottom: 44px;
       ul {
@@ -41,6 +39,10 @@
         line-height: 24px;
         color: #212121;
       }
+      .sub-title {
+        font-weight: 600;
+        font-size: 20px;
+      }
     }
     @media (max-width: $breakpoint-sm) {
       width: 100%;