diff --git a/.gitignore b/.gitignore index f9e9b93..8207146 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,5 @@ _site vendor/ .bundle/ **/.DS_Store +__pycache__/ +docs/ diff --git a/README.md b/README.md index 0cc3723..0bd9bbe 100644 --- a/README.md +++ b/README.md @@ -77,4 +77,14 @@ bundle exec jekyll serve --livereload Open in a browser. +## Refresh the organization map list +The accessible list of institutions on the ARK organizations map is generated +from the map's KML export into `_data/organization_map.json`. To refresh it +after the map changes, run from the project directory: + +```sh +python3 scripts/update_organization_map.py +``` + +To use a KML file you have already downloaded, pass its path as an argument. diff --git a/_brand/includes/content/anatomy2.html b/_brand/includes/content/anatomy2.html deleted file mode 100644 index b1a9122..0000000 --- a/_brand/includes/content/anatomy2.html +++ /dev/null @@ -1,10 +0,0 @@ - https://example.org/ark:12345/x54xz321/s3/f8.05v.tiff - \_________________/ \__/\___/ \______/\____/\_______/ - | | | | | | - | ARK Label | | Sub-parts Variants - | | | - Name Mapping Authority (NMA) | Assigned Name - | - Name Assigning Authority Number (NAAN) -{: .bg-secondary-subtle } - diff --git a/_brand/includes/content/anatomy2.txt b/_brand/includes/content/anatomy2.txt new file mode 100644 index 0000000..d520d76 --- /dev/null +++ b/_brand/includes/content/anatomy2.txt @@ -0,0 +1,8 @@ + https://example.org/ark:12345/x54xz321/s3/f8.05v.tiff + \_________________/ \__/\___/ \______/\____/\_______/ + | | | | | | + | ARK Label | | Sub-parts Variants + | | | + Name Mapping Authority (NMA) | Assigned Name + | + Name Assigning Authority Number (NAAN) diff --git a/_brand/includes/content/anatomy3.html b/_brand/includes/content/anatomy3.html deleted file mode 100644 index 435f524..0000000 --- a/_brand/includes/content/anatomy3.html +++ /dev/null @@ -1,16 +0,0 @@ - ARK ANATOMY -   Compact ARK - _______________________________ -                     /                     \ -   Resolver Service   Base Object Name  Qualifiers - __________________  ________________  _____________ -   /                  \/        ...     \/             \ -   https://example.org/ark:12345/x54xz321/s3/f8.05v.tiff -   \_________/ \__/\___/ \______/\____/\_______/ -              |         |   |  ...  |     |       | -              |  ARK Label  |   |   | Sub-parts  Variants -              |            |   |   | - Name Mapping Authority (NMA) |   |  Assigned Name     ... -                             |   +---------- Shoulder: /x5 -     Name Assigning Authority Number (NAAN) ... -{: .bg-secondary-subtle } diff --git a/_brand/includes/content/anatomy3.txt b/_brand/includes/content/anatomy3.txt new file mode 100644 index 0000000..a5a6d56 --- /dev/null +++ b/_brand/includes/content/anatomy3.txt @@ -0,0 +1,15 @@ + ARK ANATOMY +   Compact ARK + _______________________________ +                     /                     \ +   Resolver Service   Base Object Name  Qualifiers + __________________  ________________  _____________ +   /                  \/        ...     \/             \ +   https://example.org/ark:12345/x54xz321/s3/f8.05v.tiff +   \_________/ \__/\___/ \______/\____/\_______/ +              |         |   |  ...  |     |       | +              |  ARK Label  |   |   | Sub-parts  Variants +              |            |   |   | + Name Mapping Authority (NMA) |   |  Assigned Name     ... +                             |   +---------- Shoulder: /x5 +     Name Assigning Authority Number (NAAN) ... diff --git a/_brand/includes/content/anatomy4.txt b/_brand/includes/content/anatomy4.txt new file mode 100644 index 0000000..34ce1f5 --- /dev/null +++ b/_brand/includes/content/anatomy4.txt @@ -0,0 +1,6 @@ + Resolver Service Compact ARK + __________________ _______________________________ + / \/ \ + https://example.org/ark:/12345/x6np1wh8k/c3/s5.v7.xsl + \____________________________/\________/\___________/ + Prefixes Base Name Suffixes diff --git a/_brand/includes/content/ascii_art.html b/_brand/includes/content/ascii_art.html new file mode 100644 index 0000000..07c436f --- /dev/null +++ b/_brand/includes/content/ascii_art.html @@ -0,0 +1,39 @@ +{% comment %} + Usage: + {% include content/ascii_art.html url="/assets/images/aart.txt" description="This is an ASCII art image." link="https://example.com" nocaption=true %} +{% endcomment %} + +{%- assign width = include.width | default: "100%" -%} +{%- assign label = include.label | default: "Text diagram" -%} +{% if include.nocaption == nil %} +
+{% else %} +
+{% endif %} + + {% if include.link != nil %} + + {% endif %} + + 
+      {%- include {{ include.url }} -%}
+
+ + {% if include.link != nil %} + + {% endif %} + + {% if include.nocaption == nil %} +
+ {{ include.description | markdownify }} +
+ {% endif %} + +{% if include.nocaption == nil %} +
+{% else %} + +{% endif %} diff --git a/_brand/includes/content/fig.html b/_brand/includes/content/fig.html new file mode 100644 index 0000000..47ada0c --- /dev/null +++ b/_brand/includes/content/fig.html @@ -0,0 +1,41 @@ +{% comment %} + Usage: + {% include content/fig.html url="/assets/images/example.jpg" alt="A concise image description." description="This is an example image." label="Example image" link="https://example.com" nocaption=true %} + If no alt text is provided, tries to use the first sentence of description. +{% endcomment %} + +{% if include.nocaption == nil %} +
+{% else %} +
+{% endif %} + + {%- assign width = include.width | default: "100%" -%} + {%- if include.alt != nil -%} + {%- assign alt = include.alt -%} + {%- else -%} + {%- assign alt = include.description | default: "" | strip_html | split: ". " | first -%} + {%- endif -%} + {% if include.link != nil %} + + {% endif %} + + {{ alt | escape }} + + {% if include.link != nil %} + + {% endif %} + + {% if include.nocaption == nil %} +
+ {{ include.description | markdownify | remove: '

' | remove: '

' }} +
+ {% endif %} + +{% if include.nocaption == nil %} +
+{% else %} + +{% endif %} diff --git a/_brand/includes/content/image.html b/_brand/includes/content/image.html deleted file mode 100644 index abad65b..0000000 --- a/_brand/includes/content/image.html +++ /dev/null @@ -1,4 +0,0 @@ -
- {{ include.description }} -
{{ include.description }}
-
diff --git a/_brand/includes/content/owl_bike_key.txt b/_brand/includes/content/owl_bike_key.txt new file mode 100644 index 0000000..6bdb002 --- /dev/null +++ b/_brand/includes/content/owl_bike_key.txt @@ -0,0 +1,24 @@ + _____ slips on _____ + .-' ,_,'-.. ----> .-' '-. + / (o,o) \\ / \ + : {`"'} || : `____ + / .-. -"-"- || / .-. '--^. .^--^. .^. + { ( ) || { ( ) `-' `-^--^-' '--^. + \ `-' _o || \ '-' ===================================} + : _|<,_ || : __________________________________/ + \ (*)/(*) / \ / + `-._____.-' `-._____.-' + |....................|...............|....|..........................|..| + ^ ^ ^ ^ ^ + : : : : : + Cover= Bow= Shoulder .------ Blade Tip + NMA Scheme+NAAN : : .-------------------' + : : : : : : + v v v v v v + |..........................|....+.....|...|......|.| + https://OwlBike.example.org/ark:13030/tqb3kh97gh8w <---- Example Key + doi:10.30/tqb3kh97gh8w with parallel + hdl:13030/tqb3kh97gh8w parts in other + urn:13030:tqb3kh97gh8w id schemes. + |..........................|.......................|.... + Name Mapping Authority Base object name ... diff --git a/_brand/includes/content/pid-comparison-table.html b/_brand/includes/content/pid-comparison-table.html new file mode 100644 index 0000000..3ec0d59 --- /dev/null +++ b/_brand/includes/content/pid-comparison-table.html @@ -0,0 +1,17 @@ +
+ + + + + + + + + + + + + + +
Capabilities defined for five types of persistent identifier in the original comparison.
Major causes of broken links, and some featuresPURLHandleURNDOIARK
Prevents fire, war, flood, attack, bankruptcy, ...NoNoNoNoNo
Prevents human errorNoNoNoNoNo
Guarantees your links, or fixes them for youNoNoNoNoNo
Decentralized admin plus inferenceable syntaxNoNoNoNoYes
Flexible metadata and persistence statementsNoNoNoNoYes
Identifiers extensible during resolutionYesNoYesNoYes
Free, non-paywalled, in unlimited numbersYesNoYesNoYes
+
diff --git a/_brand/includes/content/section.html b/_brand/includes/content/section.html new file mode 100644 index 0000000..4d5359a --- /dev/null +++ b/_brand/includes/content/section.html @@ -0,0 +1,21 @@ +{% comment %} + Start, change, or end a section. Arguments: + - do: "start", "end", or "changeto" + - color: "warm" (default) or "cool" + + Usage: + include content/section.html do="start" color="main" + include content/section.html do="changeto" color="cool" + include content/section.html do="end" + + Surrounding blank lines and no indentation to protect markdown content. +{% endcomment %} + +{% if include.do == "end" or include.do == "changeto" %} + + +{% endif %} +{% if include.do == "start" or include.do == "changeto" %} +
+
+{% endif %} diff --git a/_brand/includes/content/side-by-side.html b/_brand/includes/content/side-by-side.html new file mode 100644 index 0000000..c95995f --- /dev/null +++ b/_brand/includes/content/side-by-side.html @@ -0,0 +1,44 @@ +{% comment %} + + Usage: Use capture to get formatted markdown, for example (without { and }), + % capture my_text % + ### Project Details + This section contains a complex list: + * **Timeline**: 4 weeks + * **Tools**: Jekyll, Liquid + * **Goal**: Responsive layout + + Can have [multiple paragraphs](https://jekyllrb.com) and links here. + % endcapture % + Then use the side-by-side include with same arguments as fig include, eg, + url="/assets/images/example.jpg" + description="This is an example image." + link="https://example.com" + nocaption=true + plus the content and an optional reverse flag: + content=my_text + reverse=true + For example (args must all be on one line): + {% include content/side-by-side.html content=my_text reverse=true url="..." description="..." nocaption=true %} + +{% endcomment %} + +{%- assign direction = "row" -%} +{%- if include.reverse -%} + {%- assign direction = "row-reverse" -%} +{%- endif -%} +
+ +
+ {{ include.content }} +
+ +
+ {%- assign url = include.url -%} + {%- assign description = include.description -%} + {%- assign link = include.link | default: nil -%} + {%- assign nocaption = include.nocaption | default: "1" -%} + {% include content/fig.html url=url description=description link=link nocaption=nocaption %} +
+
diff --git a/_brand/includes/content/sitemap-list.html b/_brand/includes/content/sitemap-list.html index 1ad542b..1b15a66 100644 --- a/_brand/includes/content/sitemap-list.html +++ b/_brand/includes/content/sitemap-list.html @@ -8,7 +8,7 @@

Pages

{% for page in sorted_pages %} {% if page.title and page.permalink != "/404.html" %}
  • - + {{ page.title }}
    • diff --git a/_brand/includes/footer/footer.html b/_brand/includes/footer/footer.html index 3b79cc3..e8f320e 100644 --- a/_brand/includes/footer/footer.html +++ b/_brand/includes/footer/footer.html @@ -1,23 +1,28 @@ -