From b501313ed0869eea5312515b7708d4b54cc9fb12 Mon Sep 17 00:00:00 2001 From: 2SC1815J <2SC1815J@users.noreply.github.com> Date: Wed, 28 Aug 2024 14:15:00 +0900 Subject: [PATCH 1/6] Add IIIF Curation Viewer --- recipe/0001-mvm-image/index.md | 1 + recipe/0004-canvas-size/index.md | 3 ++- recipe/0005-image-service/index.md | 3 ++- recipe/0006-text-language/index.md | 3 ++- recipe/0007-string-formats/index.md | 3 ++- recipe/0008-rights/index.md | 3 ++- recipe/0009-book-1/index.md | 3 ++- recipe/0010-book-2-viewing-direction/index.md | 3 ++- recipe/0029-metadata-anywhere/index.md | 3 ++- recipe/0118-multivalue/index.md | 3 ++- recipe/0283-missing-image/index.md | 1 + recipe/matrix.md | 1 + 12 files changed, 21 insertions(+), 9 deletions(-) diff --git a/recipe/0001-mvm-image/index.md b/recipe/0001-mvm-image/index.md index 9ac30a3c5..8044d2bf2 100644 --- a/recipe/0001-mvm-image/index.md +++ b/recipe/0001-mvm-image/index.md @@ -11,6 +11,7 @@ viewers: - Clover - Glycerine Viewer - Theseus + - Curation topic: - basic - image diff --git a/recipe/0004-canvas-size/index.md b/recipe/0004-canvas-size/index.md index 77a1a38b9..d4ecea891 100644 --- a/recipe/0004-canvas-size/index.md +++ b/recipe/0004-canvas-size/index.md @@ -9,6 +9,7 @@ viewers: - Mirador - Annona - Theseus + - Curation topic: image code: - iiif-prezi3 @@ -39,7 +40,7 @@ The aspect ratio should be consistent between your source image and Canvas. Othe This example shows a Manifest with a single Canvas that has height and width dimensions three times the pixel dimensions of the image in order to construct a Canvas with both dimensions greater than 1000px. -{% include manifest_links.html viewers="UV, Mirador, Annona, Theseus" manifest="manifest.json" %} +{% include manifest_links.html viewers="UV, Mirador, Annona, Theseus, Curation" manifest="manifest.json" %} {% include jsonviewer.html src="manifest.json" config="data-line='14-15,29-30'"%} # Related recipes diff --git a/recipe/0005-image-service/index.md b/recipe/0005-image-service/index.md index 18652404e..79d301401 100644 --- a/recipe/0005-image-service/index.md +++ b/recipe/0005-image-service/index.md @@ -10,6 +10,7 @@ viewers: - Clover - Glycerine Viewer - Theseus + - Curation topic: - basic - image @@ -37,7 +38,7 @@ Though a version 3 Manifest may specify a service using the version 2 `@id` and ## Example -{% include manifest_links.html viewers="Mirador, Annona, Clover, Glycerine Viewer, Theseus" manifest="manifest.json" %} +{% include manifest_links.html viewers="Mirador, Annona, Clover, Glycerine Viewer, Theseus, Curation" manifest="manifest.json" %} {% include jsonviewer.html src="manifest.json" config='data-line="36-42"' %} diff --git a/recipe/0006-text-language/index.md b/recipe/0006-text-language/index.md index 6f5f27531..b322c86f0 100644 --- a/recipe/0006-text-language/index.md +++ b/recipe/0006-text-language/index.md @@ -10,6 +10,7 @@ viewers: - Annona - Glycerine Viewer - Theseus + - Curation topic: basic property: label, summary, metadata, requiredStatement code: @@ -42,7 +43,7 @@ To see the language choice in the linked viewers, open the settings menu (gear i The image in this example was sourced via Wikimedia Commons and is public domain. -{% include manifest_links.html viewers="UV, Mirador, Annona, Glycerine Viewer, Theseus" manifest="manifest.json" %} +{% include manifest_links.html viewers="UV, Mirador, Annona, Glycerine Viewer, Theseus, Curation" manifest="manifest.json" %} {% include jsonviewer.html src="manifest.json" config='data-line="6-11, 16-21, 24-26, 31-36, 39-44, 49-54, 58-63, 66-68"' %} diff --git a/recipe/0007-string-formats/index.md b/recipe/0007-string-formats/index.md index 72fc67c7a..113d2cd11 100644 --- a/recipe/0007-string-formats/index.md +++ b/recipe/0007-string-formats/index.md @@ -11,6 +11,7 @@ viewers: - Clover - Glycerine Viewer - Theseus + - Curation topic: property property: label, summary, metadata, requiredStatement code: @@ -33,7 +34,7 @@ For security reasons, clients are expected to allow only `a`, `b`, `br`, `i`, `i ## Example -{% include manifest_links.html viewers="UV, Mirador, Annona, Clover, Glycerine Viewer, Theseus" manifest="manifest.json" %} +{% include manifest_links.html viewers="UV, Mirador, Annona, Clover, Glycerine Viewer, Theseus, Curation" manifest="manifest.json" %} {% include jsonviewer.html src="manifest.json" config='data-line="7,12,24,38"' %} diff --git a/recipe/0008-rights/index.md b/recipe/0008-rights/index.md index 7ff438e0f..e6a890cbd 100644 --- a/recipe/0008-rights/index.md +++ b/recipe/0008-rights/index.md @@ -11,6 +11,7 @@ viewers: - Clover - Glycerine Viewer - Theseus + - Curation topic: property property: rights, requiredStatement code: @@ -41,7 +42,7 @@ None known. ## Example -{% include manifest_links.html viewers="UV, Mirador, Annona, Clover, Glycerine Viewer, Theseus" manifest="manifest.json" %} +{% include manifest_links.html viewers="UV, Mirador, Annona, Clover, Glycerine Viewer, Theseus, Curation" manifest="manifest.json" %} {% include jsonviewer.html src="manifest.json" config='data-line="15-27"' %} diff --git a/recipe/0009-book-1/index.md b/recipe/0009-book-1/index.md index 1be820589..38c9ff3ad 100644 --- a/recipe/0009-book-1/index.md +++ b/recipe/0009-book-1/index.md @@ -11,6 +11,7 @@ viewers: - Clover - Glycerine Viewer - Theseus + - Curation topic: - image - basic @@ -38,7 +39,7 @@ You should also consider providing a [thumbnail][prezi3-thumbnail] for each Canv ## Example -{% include manifest_links.html viewers="UV, Mirador, Annona, Clover, Glycerine Viewer, Theseus" manifest="manifest.json" %} +{% include manifest_links.html viewers="UV, Mirador, Annona, Clover, Glycerine Viewer, Theseus, Curation" manifest="manifest.json" %} {% include jsonviewer.html src="manifest.json" %} diff --git a/recipe/0010-book-2-viewing-direction/index.md b/recipe/0010-book-2-viewing-direction/index.md index fb728035d..e9ba44f16 100644 --- a/recipe/0010-book-2-viewing-direction/index.md +++ b/recipe/0010-book-2-viewing-direction/index.md @@ -9,6 +9,7 @@ viewers: - Mirador - Annona - Theseus + - Curation topic: - image - property @@ -41,7 +42,7 @@ None known This Manifest shows the playbill for "Akiba gongen kaisen-banashi," "Futatsu chōchō kuruwa nikki", and "Godairiki koi no fūjime", kabuki performances at the Chikugo Theater in Osaka, from the fifth month of Kaei 2 (May, 1849). -{% include manifest_links.html viewers="UV, Mirador, Annona, Theseus" manifest="manifest-rtl.json" %} +{% include manifest_links.html viewers="UV, Mirador, Annona, Theseus, Curation" manifest="manifest-rtl.json" %} {% include jsonviewer.html src="manifest-rtl.json" config='data-line="15"' %} diff --git a/recipe/0029-metadata-anywhere/index.md b/recipe/0029-metadata-anywhere/index.md index 901f1cb0c..bf4606103 100644 --- a/recipe/0029-metadata-anywhere/index.md +++ b/recipe/0029-metadata-anywhere/index.md @@ -12,6 +12,7 @@ viewers: support: partial - Glycerine Viewer - Theseus + - Curation topic: property property: metadata --- @@ -38,7 +39,7 @@ Note: Clover supports Metadata at the Manifest level but not down at the Canvas. Credit: *John Dee performing an experiment before Queen Elizabeth I*. Oil painting by Henry Gillard Glindoni. Credit: Wellcome Collection. Attribution-NonCommercial 4.0 International (CC BY-NC 4.0) -{% include manifest_links.html viewers="UV, Mirador, Annona, Clover, Glycerine Viewer, Theseus" manifest="manifest.json" %} +{% include manifest_links.html viewers="UV, Mirador, Annona, Clover, Glycerine Viewer, Theseus, Curation" manifest="manifest.json" %} {% include jsonviewer.html src="manifest.json" config='data-line="10-59, 83-96, 136-149"' %} diff --git a/recipe/0118-multivalue/index.md b/recipe/0118-multivalue/index.md index 42024d447..849ab689b 100644 --- a/recipe/0118-multivalue/index.md +++ b/recipe/0118-multivalue/index.md @@ -10,6 +10,7 @@ viewers: - Annona - Glycerine Viewer - Theseus + - Curation topic: property property: label, summary, metadata, requiredStatement --- @@ -32,7 +33,7 @@ None In this example, the work has multiple titles in both English and French. The Manifest `label` provides a single title in French within a single-value array (lines 6–8). The alternative titles are provided in the `metadata` property in both English and French, each with variants contained within two separate arrays -- one array for English (lines 18–21) and one for French (lines 22–25). In the `summary` property (lines 30–32) the value is included as a single-string array. -{% include manifest_links.html viewers="UV, Mirador, Annona, Glycerine Viewer, Theseus" manifest="manifest.json" %} +{% include manifest_links.html viewers="UV, Mirador, Annona, Glycerine Viewer, Theseus, Curation" manifest="manifest.json" %} {% include jsonviewer.html src="manifest.json" config='data-line="6-8, 18-21, 22-25, 30-32"'%} diff --git a/recipe/0283-missing-image/index.md b/recipe/0283-missing-image/index.md index 6f36a1a88..7c55eae52 100644 --- a/recipe/0283-missing-image/index.md +++ b/recipe/0283-missing-image/index.md @@ -9,6 +9,7 @@ viewers: - Mirador - Glycerine Viewer - Theseus + - Curation topic: - image - basic diff --git a/recipe/matrix.md b/recipe/matrix.md index f12808cbd..4a70d9fde 100644 --- a/recipe/matrix.md +++ b/recipe/matrix.md @@ -14,6 +14,7 @@ viewers: - Aviary - Glycerine Viewer - Theseus + - Curation topics: - basic - property From 4d630c81b06082213b0d0b6c245d2a52dfd7a4a0 Mon Sep 17 00:00:00 2001 From: Glen Robson Date: Fri, 30 Aug 2024 15:23:21 +0100 Subject: [PATCH 2/6] Trying with ignoring the fontawsome issue --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index ef835893c..edbf8caf4 100644 --- a/Gemfile +++ b/Gemfile @@ -4,7 +4,7 @@ gem 'jekyll', '~> 4.1.1' # for local development, clone theme + use path loader # gem 'iiifc-theme', path: 'iiifc-theme' -gem 'iiifc-theme', github: 'iiif/iiifc-theme', branch: 'main' +gem 'iiifc-theme', github: 'iiif/iiifc-theme', branch: 'ignore-font-awsome' # For open graph and Twitter Card elements gem 'jekyll-seo-tag' From a0cac595a6a01db5382b7d0bd16e9c351bcf63d8 Mon Sep 17 00:00:00 2001 From: Glen Robson Date: Fri, 30 Aug 2024 15:25:09 +0100 Subject: [PATCH 3/6] Updating gem lock file --- Gemfile.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index bf1dc3143..6bb67cb30 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ GIT remote: https://github.com/iiif/iiifc-theme.git - revision: afff3ef39910d7454c58abf2b9c9e6a50cc7cb4c - branch: main + revision: a1a48285ca5bbf81d6967cf31fdcdb571da3068b + branch: ignore-font-awsome specs: iiifc-theme (0.1.0) html-proofer @@ -18,7 +18,7 @@ GEM addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) colorator (1.1.0) - concurrent-ruby (1.3.3) + concurrent-ruby (1.3.4) diff-lcs (1.5.1) em-websocket (0.5.3) eventmachine (>= 0.12.9) @@ -84,7 +84,7 @@ GEM racc (~> 1.4) nokogumbo (2.0.5) nokogiri (~> 1.8, >= 1.8.4) - parallel (1.25.1) + parallel (1.26.3) pathutil (0.16.2) forwardable-extended (~> 2.6) public_suffix (6.0.1) @@ -95,7 +95,7 @@ GEM rb-inotify (0.11.1) ffi (~> 1.0) redcarpet (3.6.0) - rexml (3.3.4) + rexml (3.3.6) strscan rouge (3.30.0) rspec (3.13.0) @@ -104,7 +104,7 @@ GEM rspec-mocks (~> 3.13.0) rspec-core (3.13.0) rspec-support (~> 3.13.0) - rspec-expectations (3.13.1) + rspec-expectations (3.13.2) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) rspec-mocks (3.13.1) From e834b5265718f66de86dc3ff4f79f3ac901d53c5 Mon Sep 17 00:00:00 2001 From: Glen Robson Date: Fri, 27 Sep 2024 15:03:19 +0100 Subject: [PATCH 4/6] Adding context to Curation viewer link --- recipe/0006-text-language/index.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/recipe/0006-text-language/index.md b/recipe/0006-text-language/index.md index b322c86f0..d154110bc 100644 --- a/recipe/0006-text-language/index.md +++ b/recipe/0006-text-language/index.md @@ -39,7 +39,11 @@ In the `metadata` and `requiredStatement` properties, the `label` strings for "C Finally, the `summary` property (lines 49-54) has values in both English and French. -To see the language choice in the linked viewers, open the settings menu (gear icon) and choose either English or French. +With the Universal Viewer, Mirador and Glycerine you can open the settings menu (gear icon) and choose either English or French. + +For the Curation viewer you need to add a `lang=fr` parameter to access the French properties. You can see the French values on the [IIIF Curation Viewer](http://codh.rois.ac.jp/software/iiif-curation-viewer/demo/?manifest=https://iiif.io/api/cookbook/recipe/0006-text-language/manifest.json&lang=fr) demo site. + +Note the viewers included in this recipe are for the specific languages in the example of this recipe i.e. French and English. Not all viewers support all languages and users should check the viewers with their manifests to see if they need to configure the viewer to make the extra languages available. The image in this example was sourced via Wikimedia Commons and is public domain. From efa4ce7799dfd9a490168ba2b31a399595297fd4 Mon Sep 17 00:00:00 2001 From: Glen Robson Date: Fri, 27 Sep 2024 15:03:32 +0100 Subject: [PATCH 5/6] Setting Theseus and Curation to partial as they only support one manifest. --- recipe/0010-book-2-viewing-direction/index.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/recipe/0010-book-2-viewing-direction/index.md b/recipe/0010-book-2-viewing-direction/index.md index e9ba44f16..c9718246c 100644 --- a/recipe/0010-book-2-viewing-direction/index.md +++ b/recipe/0010-book-2-viewing-direction/index.md @@ -8,8 +8,10 @@ viewers: - UV - Mirador - Annona - - Theseus - - Curation + - id: Theseus + support: partial + - id: Curation + support: partial topic: - image - property From b7dec5eab3b8bc067329f4e23aee7f1433473830 Mon Sep 17 00:00:00 2001 From: Glen Robson Date: Fri, 27 Sep 2024 16:40:25 +0100 Subject: [PATCH 6/6] Addressing cookbook authors comments. --- recipe/0006-text-language/index.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/0006-text-language/index.md b/recipe/0006-text-language/index.md index d154110bc..24ca762fe 100644 --- a/recipe/0006-text-language/index.md +++ b/recipe/0006-text-language/index.md @@ -39,11 +39,11 @@ In the `metadata` and `requiredStatement` properties, the `label` strings for "C Finally, the `summary` property (lines 49-54) has values in both English and French. -With the Universal Viewer, Mirador and Glycerine you can open the settings menu (gear icon) and choose either English or French. +With the Universal Viewer, Mirador, and Glycerine you can open the settings menu (gear icon) and choose either English or French. For the Curation viewer you need to add a `lang=fr` parameter to access the French properties. You can see the French values on the [IIIF Curation Viewer](http://codh.rois.ac.jp/software/iiif-curation-viewer/demo/?manifest=https://iiif.io/api/cookbook/recipe/0006-text-language/manifest.json&lang=fr) demo site. -Note the viewers included in this recipe are for the specific languages in the example of this recipe i.e. French and English. Not all viewers support all languages and users should check the viewers with their manifests to see if they need to configure the viewer to make the extra languages available. +Note not all viewers support all languages and users should check the viewers with their manifests to see if they need to configure the viewer to make the extra languages available. The image in this example was sourced via Wikimedia Commons and is public domain.