mvp-schemam-paginam (#14): melhorada marcação HTML e outline de página

HXL-CPLP · Jun 16, 2021 · e61e4f9 · e61e4f9
1 parent e85f9f1
commit e61e4f9
Show file tree

Hide file tree

Showing 9 changed files with 187 additions and 184 deletions.
diff --git a/_data/expandendum/schemam.json b/_data/expandendum/schemam.json
@@ -27,7 +27,7 @@
       }
     ],
     "archivum": {
-      "officinale": [
+      "referens_officinale": [
         {
           "iri": "https://iso639-3.sil.org/code_tables/download_tables"
         },
@@ -37,14 +37,22 @@
       ],
       "schemam": {
         "graphql": [
-          "/schema/iso/iso639-3/eng/iso639-3.graphql"
+          {
+            "iri": "/schema/iso/iso639-3/eng/iso639-3.graphql"
+          }
         ],
         "json": [
-          "/schema/iso/iso639-3/eng/iso639-3.json",
-          "/schema/iso/iso639-3/eng/iso639-3_macrolanguages.json"
+          {
+            "iri": "/schema/iso/iso639-3/eng/iso639-3.json"
+          },
+          {
+            "iri": "/schema/iso/iso639-3/eng/iso639-3_macrolanguages.json"
+          }
         ],
         "sql": [
-          "/schema/iso/iso639-3/eng/iso639-3.sql"
+          {
+            "iri": "/schema/iso/iso639-3/eng/iso639-3.sql"
+          }
         ]
       }
     }
@@ -77,7 +85,7 @@
       }
     ],
     "archivum": {
-      "officinale": [
+      "referens_officinale": [
         {
           "iri": "https://iso639-3.sil.org/code_tables/download_tables"
         },
@@ -149,7 +157,7 @@
       }
     ],
     "archivum": {
-      "officinale": [
+      "referens_officinale": [
         {
           "iri": "https://iso639-3.sil.org/code_tables/download_tables"
         },
@@ -221,7 +229,7 @@
       }
     ],
     "archivum": {
-      "officinale": [
+      "referens_officinale": [
         {
           "iri": "https://iso639-3.sil.org/code_tables/download_tables"
         },
@@ -306,7 +314,9 @@
     ],
     "archivum": {
       "referens_officinale": [
-        "https://www.unicode.org/iso15924/iso15924.txt"
+        {
+          "iri": "https://www.unicode.org/iso15924/iso15924.txt"
+        }
       ],
       "schemam": {
         "json": [

diff --git a/_data/schemam.yml b/_data/schemam.yml
@@ -21,18 +21,18 @@
   wikidatum:
     - codicem: Q845956
   archivum:
-    officinale:
+    referens_officinale:
       - iri: https://iso639-3.sil.org/code_tables/download_tables
       - iri: https://iso639-3.sil.org/sites/iso639-3/files/downloads/iso-639-3.tab
     # referens_alternativum_nomen
     schemam:
       graphql:
-        - /schema/iso/iso639-3/eng/iso639-3.graphql # TODO: localize
+        - iri: /schema/iso/iso639-3/eng/iso639-3.graphql # TODO: localize
       json:
-        - /schema/iso/iso639-3/eng/iso639-3.json # TODO: localize
-        - /schema/iso/iso639-3/eng/iso639-3_macrolanguages.json # TODO: localize
+        - iri: /schema/iso/iso639-3/eng/iso639-3.json # TODO: localize
+        - iri: /schema/iso/iso639-3/eng/iso639-3_macrolanguages.json # TODO: localize
       sql:
-        - /schema/iso/iso639-3/eng/iso639-3.sql # TODO: localize
+        - iri: /schema/iso/iso639-3/eng/iso639-3.sql # TODO: localize
   # l10n:
   #   - linguam: eng-Latn
   #   - linguam: por-Latn
@@ -65,7 +65,7 @@
       wikidatum:
         - codicem: Q845956
       archivum:
-        officinale:
+        referens_officinale:
           - iri: https://iso639-3.sil.org/code_tables/download_tables
           - iri: https://iso639-3.sil.org/sites/iso639-3/files/downloads/iso-639-3.tab
         # referens_alternativum_nomen
@@ -105,7 +105,7 @@
     - codicem: Q16866
   archivum:
     referens_officinale:
-      - https://www.unicode.org/iso15924/iso15924.txt
+      - iri: https://www.unicode.org/iso15924/iso15924.txt
     # referens_alternativum_nomen
     schemam:
       json:

diff --git a/_data/tm/commune.tm.hxl.csv b/_data/tm/commune.tm.hxl.csv
@@ -32,7 +32,8 @@ vicipaediam_nomen,,1,,,,,,vicipaediam,,nomen,,Vicipaediam,∅,Wikipédia,∅,Wik
 commune_voluntarius_auxilio_tuo_nomen,,1,,commune,,,,voluntarius_auxilio_tuo,,nomen,,Voluntarius Auxilio Tuo,∅,Ajudantes voluntário,∅,Volunteer helpers,∅,,∅
 schemam_nomen,Q2233315,1,,,,,,schemam,,nomen,,Schēmam,∅,Schema,∅,Schema,∅,,∅
 schemam_slug,Q2233315,1,,,,,,schemam,,slug,,schemam,∅,schema,∅,schema,∅,,∅
-schemam_datum_nomen,Q2233315,1,,,,,,schemam,datum,nomen,,Datum Schēmam,∅,Esquemas de dados,∅,Data Schemas,∅,,∅
+schemam_datum_nomen,Q2233315,1,,,,,,schemam,datum,nomen,,Datum Schēmam,∅,Esquemas de dados,∅,Data Schemas,∅,Esquema de datos,∅
+schemam_datum_slug,Q2233315,1,,,,,,schemam,datum,slug,,datum-Schemam,∅,esquemas-de-dados,∅,data-schemas,∅,esquema-de-datos,∅
 OpenAPI_archivum_nomen,,1,,,,,,OpenAPI,archivum,nomen,,Archīvum OpenAPI,∅,Arquivo OpenAPI,∅,OpenAPI file,∅,,∅
 PDF_archivum_salvandum_nomen,,1,,,,,,PDF,archivum_salvandum,nomen,,Salvandum PDF archīvum,∅,Salvar como arquivo PDF,∅,Save as PDF archive,∅,,∅
 L10N_linguam_Q436240_nomen,Q436240,1,L10N,L10N,linguam,Q436240,,,,nomen,,,∅,Língua antiga,∅,Ancient language,∅,,∅

diff --git a/_includes/index-corporeum-mul-Zyyy.html b/_includes/index-corporeum-mul-Zyyy.html
@@ -65,27 +65,13 @@ <h5 class="card-title" id="{{ api_alt.url | slugify }}" >
     </article>
     {% endfor %}
   </article>
-  <article>
-    <h2 id="schemam" lang="la">Schemam</h2>
-    <div class="alert alert-info" role="alert">
-      <p>{% _🗣️ 📝lat-Latn📝 opus_in_progressu_emoji_nomen 📝lat-Latn📝 🗣️_ %}</p>
-      <p>{% _🗣️ 📝eng-Latn📝 opus_in_progressu_emoji_nomen 📝eng-Latn📝 🗣️_ %}</p>
-      <p>{% _🗣️ 📝por-Latn📝 opus_in_progressu_emoji_nomen 📝por-Latn📝 🗣️_ %}</p>
-      <p>{% _🗣️ 📝spa-Latn📝 opus_in_progressu_emoji_nomen 📝spa-Latn📝 🗣️_ %}</p>
-    </div>
-  {% include temporarium/scheman.html %}
-
-  <div class="peritum-est--block">
-    <h2 id="teste--peritum-est">_[por]Teste de schemam via YAML[por]_</h2>
-
-    {% include temporarium/schemam.html %}
-    <hr>
-    {% include schemam/index.html %}
-
-  </div>
-
 
+  <!-- _[lat-Latn] Datum Schēmam [lat-Latn]_ -->
+  <article>
+    <h2 id="{% _🗣️ schemam_datum_slug 🗣️_ %}">{% _🗣️ schemam_datum_nomen 🗣️_ %}</h2>
+    {% include schemam/index.html initiale_html_hN=3 %}
   </article>
+
   <article>
     <h2 id="translationem-memoriam" lang="la">Trānslātiōnem memoriam</h2>
     <div class="alert alert-info" role="alert">

diff --git a/_includes/index-corporeum.html b/_includes/index-corporeum.html
@@ -98,15 +98,13 @@ <h5 class="card-title" id="{{ api_alt.url | slugify }}" >
     </article>
     {% endfor %}
   </article>
-  <article>
-    <h2 id="schemam">{% _🗣️ schemam_nomen 🗣️_ %}</h2>
-    <div class="alert alert-info" role="alert">
-      <p>{% _🗣️ opus_in_progressu_emoji_nomen 🗣️_ %}</p>
-    </div>
-
-  {% include temporarium/scheman.html %}
 
+  <!-- _[lat-Latn] Datum Schēmam [lat-Latn]_ -->
+  <article>
+    <h2 id="{% _🗣️ schemam_datum_slug 🗣️_ %}">{% _🗣️ schemam_datum_nomen 🗣️_ %}</h2>
+    {% include schemam/index.html initiale_html_hN=3 %}
   </article>
+
   <article>
     <h2 id="translationem-memoriam">{% _🗣️ translationem_memoriam_nomen 🗣️_ %}</h2>
     <div class="alert alert-info" role="alert">
@@ -138,15 +136,6 @@ <h3 id="agnitionem-communitatem">
     </ul>
   </aside>
 
-  <div class="peritum-est--block">
-    <h2 id="teste--peritum-est">_[por]Teste de schemam via YAML[por]_</h2>
-
-    {% include temporarium/schemam.html %}
-    <hr>
-    {% include schemam/index.html %}
-
-  </div>
-
   <section>
     <h2 id="licentiam">{% _🗣️ licentiam_nomen 🗣️_ %}</h2>
     <a href="https://unlicense.org/">

diff --git a/_includes/peritum-modum/instrumentum-balteum.html b/_includes/peritum-modum/instrumentum-balteum.html
@@ -1,51 +1,4 @@
 <!-- _includes/peritum-modum/instrumentum-balteum.html -->
-<!--
-<aside class="container">
-  <hr>
-  <div class="form-check form-switch">
-    <input class="form-check-input" type="checkbox" id="peritum-modum-est">
-    <label class="form-check-label" for="peritum-modum-est">
-      🛠️{% _🗣️ Hapi_peritum_modum_est_nomen 🗣️_ %}🛠️
-    </label>
-  </div>
-
-  <div class="peritum-est">
-    <h2 style="font-size: 1em;">{% _🗣️ 👁️lat-Latn👁️ _👂Peritum modum👂_ 👁️lat-Latn👁️ 🗣️_ %}</h2>
-    <nav class="navbar navbar-expand-lg navbar-light bg-light">
-      <a class="navbar-brand" href="#">
-        <h3 style="font-size: 0.8em;">
-          {% _🗣️ 👁️lat-Latn👁️ _👂Instrumentum balteum👂_ 👁️lat-Latn👁️ 🗣️_ %}
-        </h3>
-      </a>
-      <button class="navbar-toggler" type="button" data-toggle="collapse"
-        data-target="#navbarNavAltMarkup" aria-controls="navbarNavAltMarkup"
-        aria-expanded="false" aria-label="Toggle navigation">
-        <span class="navbar-toggler-icon"></span>
-      </button>
-      <div class="collapse navbar-collapse" id="navbarNavAltMarkup">
-        <div class="navbar-nav">
-          <a class="nav-item nav-link"
-            href="https://wave.webaim.org/report#/{{ page.url | absolute_url }}">
-            WAVE?
-          </a>
-          <a class="nav-item nav-link"
-            href="https://validator.w3.org/nu/?showoutline=yes&showimagereport=yes&doc={{ page.url | absolute_url | url_encode }}">
-            HTML5?
-          </a>
-          <a class="nav-item nav-link"
-            href="https://search.google.com/structured-data/testing-tool/u/0/#url={{ page.url | absolute_url | url_encode }}">
-            Schema?
-          </a>
-          <a class="nav-item nav-link"
-            href="https://developers.google.com/speed/pagespeed/insights/?url={{ page.url | absolute_url | url_encode }}">
-            PageSpeed?
-          </a>
-        </div>
-      </div>
-    </nav>
-  </div>
-</aside>
--->
 
 <div class="peritum-est">
   <nav class="navbar fixed-bottom navbar-expand-sm navbar-dark bg-dark">
@@ -157,4 +110,4 @@ <h2 class="visually-hidden-focusable">Peritum mode</h2>
       </div>
     </div>
   </nav>
-<div>
+</div>
diff --git a/_includes/schemam/index.html b/_includes/schemam/index.html
@@ -1,34 +1,33 @@
 <!-- _includes/schemam/index.html -->
 
+{% assign h_1sx = include.initiale_html_hN %}
+{% assign h_2sx = h_1sx | plus: 1 %}
+{% assign h_3sx = h_2sx | plus: 1 %}
 
-<section>
-  <h3 id="todo-schema">schemam</h3>
-  {% for xschemam_global in site.data.hapi.xschemam %}
-    {% if xschemam_global.collectionem_xschemam %}
-    gid - {{ xschemam_global.gid }}
-    {% for xschemam in xschemam_global.collectionem_xschemam %}
-      {% if xschemam.alternativum_linguam contains page.linguam %}
-        {% assign rem = xschemam.alternativum | where: 'linguam', page.linguam | first %}
-        {% include schemam/item.html schemam=rem initiale_html_hN=3 %}
-      {% else %}
-      TODO: do it
-      {% endif %}
+{% assign h1sx = h_1sx | | prepend: 'h' %}
+{% assign h2sx = h_2sx | | prepend: 'h' %}
+{% assign h3sx = h_3sx | | prepend: 'h' %}
 
-      <article>
-        {% comment %} {{ xschemam_global | inspect }} {% endcomment %}
-        <br>
-        <br>
-        {% comment %} {{ xschemam_global.collectionem_xschemam | inspect }} {% endcomment %}
-        <br>
-        <br>
-        {{ xschemam }}
-        <br>
-        {{ xschemam.alternativum_linguam }}
-        <br>
-        <br>
-        <br>
-      </article>
-    {% endfor %}
-    {% endif %}
-  {% endfor %}
-<section>
+{% for xschemam_global in site.data.hapi.xschemam %}
+  {% if xschemam_global.collectionem_xschemam %}
+    <section>
+      <{{ h1sx }} id="{% _🗣️ Hapi_schemam_slug 🗣️_ %}--{{ xschemam_global.gid }}">
+        {{ xschemam_global.nomen }}
+      </{{ h1sx }}>
+
+      {% for xschemam in xschemam_global.collectionem_xschemam %}
+        {% if xschemam.alternativum_linguam contains page.linguam %}
+          {% assign rem = xschemam.alternativum | where: 'linguam', page.linguam | first %}
+          <article>
+            {% include schemam/item.html schemam=rem initiale_html_hN=h_2sx %}
+          </article>
+        {% else %}
+          <section>
+            TODO: X-default fallback
+            {{ xschemam.alternativum_linguam }}
+          </section>
+        {% endif %}
+      {% endfor %}
+    </section>
+  {% endif %}
+{% endfor %}