use new templates config directive

Author: azaroth42

README.md

@@ -40,11 +40,12 @@ Install the generator:
 
 Run the generator:
 
-`generate-schema-doc --config no_show_breadcrumbs --config description_is_markdown --config template_name=$PWD/template schema/object.json html/object.html`
+`generate-schema-doc --config no_show_breadcrumbs --config description_is_markdown --config template_folder=$PWD/template --config template_name=la schema/object.json html/object.html`
 
 The options I use:
 
 * `no_show_breadcrumbs`: this prevents it from showing the path through the schema at each stage. We don't care about the structure of the schema in the API docs.
 * `description_is_markdown`: parses the `description` field in the schemas as markdown not plain text, allowing links and basic formatting
-* `template_name` is normally only `js` or `flat`, but this abuses a side effect of the os.path.join() function to allow passing arbitrary template directories in
+* `template_folder` is where templates are available
+* `template_name` is the name of the template within the above folder (another directory, with the HTML, CSS and JS files in it)
 

html/object.html

@@ -358,6 +358,8 @@
             "additionalProperties": false
         },
         "Statement": {
+            "title": "E33_Linguistic_Object",
+            "description": "An embedded, relatively short piece of textual content",
             "type": "object",
             "properties": {
                 "_label": {
@@ -620,6 +622,8 @@
             "additionalProperties": false
         },
         "Concept": {
+            "title": "crm:E55_Type",
+            "description": "",
             "type": "object",
             "properties": {
                 "id": {
@@ -916,7 +920,6 @@
             "additionalProperties": false
         },
         "NameOrIdentifier": {
-            "title": "Name or Identifier",
             "description": "A Name or an Identifier",
             "anyOf": [
                 {
@@ -928,7 +931,6 @@
             ]
         },
         "LingObjOrStatement": {
-            "title": "Linguistic Object Reference or Statement",
             "description": "A Linguistic Object Reference or Statement",
             "anyOf": [
                 {
@@ -940,7 +942,6 @@
             ]
         },
         "LingObjOrDigitalObjOrStatement": {
-            "title": "Linguistic Object Reference, Digital Object Reference or Statement",
             "description": "A Linguistic Object Reference, Digitial Object Reference or Statement",
             "anyOf": [
                 {
@@ -955,7 +956,6 @@
             ]
         },
         "PersonRefOrGroupRef": {
-            "title": "Reference to a Person or Group",
             "description": "A Reference to a Person or Group",
             "anyOf": [
                 {
@@ -987,7 +987,6 @@
             ]
         },
         "HumanMadeObjectRefOrPersonRefOrGroupRef": {
-            "title": "Reference to a Human Made Object, Person or Group",
             "description": "A Reference to a Human Made Object,Person or Group",
             "anyOf": [
                 {
@@ -1025,7 +1024,7 @@
             ]
         },
         "PlaceRef": {
-            "title": "Reference to a Place",
+            "title": "crm:E53_Place",
             "description": "Reference to a `Place`",
             "type": "object",
             "properties": {
@@ -1057,7 +1056,7 @@
             "additionalProperties": false
         },
         "PersonRef": {
-            "title": "Reference to a Person",
+            "title": "E21_Person",
             "description": "Reference to a `Person`",
             "type": "object",
             "properties": {

html/person.html

@@ -54,6 +54,8 @@
 
 	"definitions": {
 		"Production": {
+			"title": "crm:E12_Production",
+			"description": "",
 			"type": "object",
 			"properties": {
 				"type": {"allOf": [{"title": "General", "$ref": "core.json#/definitions/typeProp"}, 
@@ -75,6 +77,8 @@
 			}
 		},
 		"Destruction": {
+			"title": "crm:E6_Destruction",
+			"description": "",
 			"type": "object",
 			"properties": {
 				"type": {"allOf": [{"title": "General", "$ref": "core.json#/definitions/typeProp"}, 
@@ -89,6 +93,8 @@
 			}
 		},
 		"PartRemoval": {
+			"title": "crm:E80_Part_Removal",
+			"description": "",
 			"type": "object",
 			"properties": {
 				"type": {"allOf": [{"title": "General", "$ref": "core.json#/definitions/typeProp"}, 

html/place.html

@@ -18,22 +18,25 @@
 		"representation": {"$ref": "core.json#/definitions/representationProp"},
 		"member_of": {"$ref": "core.json#/definitions/member_ofGroupProp"},
 		"subject_of": {"$ref": "core.json#/definitions/subject_ofProp"},
-
 		"carried_out": {"$ref": "core.json#/definitions/carried_outProp"},
 		"contact_point": {"$ref": "core.json#/definitions/contact_pointProp"},
 		"residence": {"$ref": "core.json#/definitions/residenceProp"},
 
 		"born": {
+			"title": "crm:P98i_was_born",
 			"description": "The event in which this Person was born", 
 			"$ref": "#/definitions/Birth"
 		},
 		"died": {
+			"title": "crm:P100i_died_in",
 			"description": "The event in which this Person died",
 			"$ref": "#/definitions/Death"
 		}
 	},
 	"definitions": {
 		"Birth": {
+			"title": "crm:E67_Birth",
+			"description": "The birth event of a person",
 			"type": "object",
 			"properties": {
 				"type": {"allOf": [{"title": "General", "$ref": "core.json#/definitions/typeProp"}, 
@@ -48,6 +51,8 @@
 			}
 		},
 		"Death": {
+			"title": "crm:E69_Death", 
+			"description": "The death event of a person",
 			"type": "object",
 			"properties": {
 				"type": {"allOf": [{"title": "General", "$ref": "core.json#/definitions/typeProp"}, 

schema/core.json

@@ -28,6 +28,28 @@
         <br/>
 
         {%- set description = (schema | get_description) -%}
+
+        <!--
+        <span style="color:red;font-weight:normal;font-style:oblique;font-size:-1;">{{ schema.property_name }} / {{ schema.title }}  -> {{ schema.refers_to.title }} </span>
+        {%- if schema.refers_to.refers_to -%}
+        <b>{{ schema.refers_to.refers_to.title }}</b>
+        {%- endif -%}
+        -->
+
+
+        {%- if schema.refers_to.title and (not schema.property_name or schema.property_name == "items" or ( 
+            schema.title and (schema.title.startswith("crm:") or schema.title.startswith("la:")) or (
+            schema.refers_to.property_name and schema.refers_to.property_name[0].isupper() ) ) ) -%}
+            <span style="color:black;font-weight:normal;font-style:oblique;font-size:-1;">{{ schema.refers_to.title }}</span>
+
+        <!-- elif refers_to.refers_to -->
+
+        {%- endif -%}
+
+
+
+
+
         {%- include "section_description.html" -%}
     {%- endif -%}
 

schema/object.json

@@ -13,7 +13,11 @@ <h2 class="mb-0">
                     {%- if sub_property.is_additional_properties -%}
                         </em>
                     {%- endif -%}
-                    {%- if sub_property.refers_to.title -%}
+                    {%- if sub_property.title -%}
+                        <span style="color:black;font-weight:normal;font-style:oblique;font-size:-1;">
+                            {{ " " }}({{ sub_property.title }})
+                        </span>
+                    {%- elif sub_property.refers_to.title -%}
                         <span style="color:black;font-weight:normal;font-style:oblique;font-size:-1;">
                             {{ " " }}({{ sub_property.refers_to.title }})
                         </span>