diff --git a/.github/workflows/docs_build.yml b/.github/workflows/docs_build.yml index 71d7104c..8bf1fa7a 100644 --- a/.github/workflows/docs_build.yml +++ b/.github/workflows/docs_build.yml @@ -42,6 +42,8 @@ jobs: cp NewHorizons/schema.json content/schemas/ cp NewHorizons/star_system_schema.json content/schemas/ cp NewHorizons/translation_schema.json content/schemas/ + cp NewHorizons/shiplog_schema.xsd content/schemas/ + cp NewHorizons/dialogue_schema.xsd content/schemas/ - name: Create Output Dir run: | diff --git a/NewHorizons/dialogue_schema.xsd b/NewHorizons/dialogue_schema.xsd index 52d71f24..1929ce0f 100644 --- a/NewHorizons/dialogue_schema.xsd +++ b/NewHorizons/dialogue_schema.xsd @@ -1,4 +1,5 @@  + diff --git a/NewHorizons/schema.json b/NewHorizons/schema.json index bcebb4fd..ff92347c 100644 --- a/NewHorizons/schema.json +++ b/NewHorizons/schema.json @@ -62,7 +62,8 @@ "$ref": "#/$defs/colorPart" }, "A": { - "$ref": "#/$defs/colorPart" + "$ref": "#/$defs/colorPart", + "default": 255 } } }, @@ -112,8 +113,7 @@ "properties": { "name": { "type": "string", - "description": "Unique name of your planet", - "default": "New planet" + "description": "Unique name of your planet" }, "starSystem": { "type": "string", diff --git a/NewHorizons/shiplog_schema.xsd b/NewHorizons/shiplog_schema.xsd index 1267cb7d..e67c5363 100644 --- a/NewHorizons/shiplog_schema.xsd +++ b/NewHorizons/shiplog_schema.xsd @@ -1,4 +1,5 @@  + diff --git a/docs/Pipfile b/docs/Pipfile index 2eff7d2a..729a3a76 100644 --- a/docs/Pipfile +++ b/docs/Pipfile @@ -8,6 +8,7 @@ jinja2 = "*" json-schema-for-humans = "*" markdown = "*" htmlmin = "*" +xmlschema = "*" [dev-packages] diff --git a/docs/Pipfile.lock b/docs/Pipfile.lock index fdba112c..6b0153ac 100644 --- a/docs/Pipfile.lock +++ b/docs/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "32e1cfede01ba2b312ef0b550d6d9b15ce2a2a89db4c1a961143f2a543c7cd0f" + "sha256": "c708dfd89a9b02892b9323b222b2a077a8aee1852c02a2324d85dd29a06d45ba" }, "pipfile-spec": 6, "requires": { @@ -55,6 +55,14 @@ "markers": "python_version >= '3.6'", "version": "==0.5.6" }, + "elementpath": { + "hashes": [ + "sha256:2a432775e37a19e4362443078130a7dbfc457d7d093cd421c03958d9034cc08b", + "sha256:3a27aaf3399929fccda013899cb76d3ff111734abf4281e5f9d3721ba0b9ffa3" + ], + "markers": "python_version >= '3.7'", + "version": "==2.5.0" + }, "htmlmin": { "hashes": [ "sha256:50c1ef4630374a5d723900096a961cff426dff46b48f34d194a81bbe14eca178" @@ -99,7 +107,7 @@ "sha256:8f4ac8d9a124ab408c67361090ed512deda746c04362c36c2ec16190c720c2b0", "sha256:91113caf23aa662570fe21984f08fe74f814695c0a0ea8e863a8b4c4f63f9f6e" ], - "markers": "python_version >= '3.5' and python_full_version < '4.0.0'", + "markers": "python_version >= '3.5' and python_version < '4'", "version": "==2.4.2" }, "markupsafe": { @@ -253,8 +261,16 @@ "sha256:000ca7f471a233c2251c6c7023ee85305721bfdf18621ebff4fd17a8653427ed", "sha256:0e7c33d9a63e7ddfcb86780aac87befc2fbddf46c58dbb487e0855f7ceec283c" ], - "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' and python_full_version < '4.0.0'", + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' and python_version < '4'", "version": "==1.26.8" + }, + "xmlschema": { + "hashes": [ + "sha256:3ce6fe408a8c0a0ca5917cbe6181a933dfb5cfade9714eeb07b6335f9aff7b10", + "sha256:a7ba52b774a87b59c6428cd9e3601210cbb226552208015bd40800698a6500ad" + ], + "index": "pypi", + "version": "==1.9.2" } }, "develop": {} diff --git a/docs/content/base/base.jinja2 b/docs/content/base/base.jinja2 index 272a4ee4..84450cc1 100644 --- a/docs/content/base/base.jinja2 +++ b/docs/content/base/base.jinja2 @@ -1,17 +1,9 @@ -{% if dumb %} - {% from 'macros.jinja2' import external_link, is_active_page, nav_item with context %} -{% else %} - {% from 'base/macros.jinja2' import external_link, is_active_page, nav_item with context %} -{% endif %} +{% from 'base/macros.jinja2' import external_link, is_active_page, nav_item with context %} - {% if dumb %} - {% include "meta.jinja2" %} - {% else %} - {% include "base/meta.jinja2" %} - {% endif %} + {% include "base/meta.jinja2" %} @@ -21,7 +13,7 @@ {% block resources %} {% endblock %} - +