Merge pull request #173 from minicomp/v1.1.0

v1.1.0 🔖

.github/workflows/test.yml

@@ -1,9 +1,9 @@
 name: ci:test
 on:
   push: 
-    branches: [main, development]
+    branches: [main, development, v1*]
   pull_request:
-    branches: [main, development]
+    branches: [main, development, v1*]
 
 jobs:
   test:

Rakefile

@@ -7,16 +7,11 @@ require 'yaml'
 namespace :wax do
   desc 'run default html-proofer tests'
   task :test do
-    sh "rm -rf _site .jekyll*"
+    sh "bundle exec jekyll clean"
     sh "bundle exec jekyll build -b '#{@baseurl}' -d '_site#{@baseurl}'"
     opts = {
-      check_external_hash: true,
       allow_hash_href: true,
-      check_html: true,
-      disable_external: true,
-      empty_alt_ignore: true,
       assume_extension: true,
-      only_4xx: true
     }
     HTMLProofer.check_directory('./_site', opts).run
   end

_config.yml

@@ -10,7 +10,6 @@
 #
 # Questions ?
 # ~> https://minicomp.github.io/wiki/#/
-# ~> https://gitter.im/minicomp/wax/
 #
 # ---------------------------------------------------------------
 # MAIN SETTINGS
@@ -22,8 +21,9 @@ title:            'Wax'
 description:      'Minimal Exhibitions with Jekyll'
 url:              'https://minicomp.github.io'
 baseurl:          '/wax'
-copyright:        'Example copyright org, 2019'
+copyright:        'Example copyright org, 2023'
 logo:             '/assets/logo.png'
+default_thumb:    '/assets/default.png'
 
 # ---------------------------------------------------------------
 # BUILD SETTINGS
@@ -34,7 +34,6 @@ permalink: 'pretty'
 sass:
   style: compressed
 exclude: ["Gemfile*", "*.gemspec", "Rakefile", "vendor", "spec", "README.md", "LICENSE.txt", "Docker*"]
-incremental: true
 webrick:
   headers:
     'Access-Control-Allow-Origin': '*'
@@ -130,8 +129,8 @@ footer:
       link: 'https://github.com/minicomp/wax'
     - label: 'Credits'
       link: '/credits'
-    - label: 'Contact'
-      link: 'https://gitter.im/minicomp/wax/'
+    - label: 'Wiki'
+      link: 'https://minicomp.github.io/wiki/wax/'
   logos:
     - img: '/img/logo.png'
 

_data/qatar.csv

@@ -1,13 +1,13 @@
-pid,artist,location,label,_date,object_type,current_location,source,order,layout,collection,thumbnail,manifest,full
-obj1,Al-Hajj Hafiz Muhammad Nuri,Turkey,The Dala'il al-Khayrat of al-Juzuli,1801,manuscript,"The Museum of Islamic Art, Qatar","https://commons.wikimedia.org/wiki/File:Al-Hajj_Hafiz_Muhammad_Nuri,_Turkey,_1801_-_The_Dala%27il_al-Khayrat_of_al-Juzuli_-_Google_Art_Project.jpg",00,qatar_item,qatar,"/img/derivatives/iiif/images/obj1/full/250,/0/default.jpg",/img/derivatives/iiif/obj1/manifest.json,"/img/derivatives/iiif/images/obj1/full/1140,/0/default.jpg"
-obj2,Unknown,Egypt,Sulwan Al-Muta'a,14th century,manuscript,"The Museum of Islamic Art, Qatar","https://commons.wikimedia.org/wiki/File:Unknown,_Egypt_or_Syria,_14th_Century_-_Sulwan_Al-Muta%27a_-_Google_Art_Project.jpg",01,qatar_item,qatar,"/img/derivatives/iiif/images/obj2/full/250,/0/default.jpg",/img/derivatives/iiif/obj2/manifest.json,"/img/derivatives/iiif/images/obj2/full/1140,/0/default.jpg"
-obj3,Unknown,Egypt,Map of the World,15th century,map,"The Museum of Islamic Art, Qatar","https://commons.wikimedia.org/wiki/File:Unknown,_Egypt,_15th_Century_-_Map_of_World_-_Google_Art_Project.jpg",02,qatar_item,qatar,"/img/derivatives/iiif/images/obj3/full/250,/0/default.jpg",/img/derivatives/iiif/obj3/manifest.json,"/img/derivatives/iiif/images/obj3/full/1140,/0/default.jpg"
-obj4,Unknown,Iran,"Faridun crosses the River Dijla, fol. 33v",1525 - 1535,manuscript,"The Museum of Islamic Art, Qatar","https://commons.wikimedia.org/wiki/File:Unknown,_Iran_-_Page_from_the_Shahnama_of_Shah_Tahmasp_-_Google_Art_Project.jpg",03,qatar_item,qatar,"/img/derivatives/iiif/images/obj4/full/250,/0/default.jpg",/img/derivatives/iiif/obj4/manifest.json,"/img/derivatives/iiif/images/obj4/full/1140,/0/default.jpg"
-obj5,Unknown,Iran,Panel from Iran,1600 - 1625,panel,"The Museum of Islamic Art, Qatar","https://commons.wikimedia.org/wiki/File:Unknown,_Iran_-_Panel_from_Iran_-_Google_Art_Project.jpg",04,qatar_item,qatar,"/img/derivatives/iiif/images/obj5/full/250,/0/default.jpg",/img/derivatives/iiif/obj5/manifest.json,"/img/derivatives/iiif/images/obj5/full/1140,/0/default.jpg"
-obj6,Unknown,Iran,Diwan of Jami Manuscript,16th century,manuscript,"The Museum of Islamic Art, Qatar","https://commons.wikimedia.org/wiki/File:Unknown,_Iran,_16th_Century_-_Diwan_of_Jami_Manuscript_-_Google_Art_Project.jpg",05,qatar_item,qatar,"/img/derivatives/iiif/images/obj6/full/250,/0/default.jpg",/img/derivatives/iiif/obj6/manifest.json,"/img/derivatives/iiif/images/obj6/full/1140,/0/default.jpg"
-obj7,Unknown,Iran,Page from the Shahnama,1525 - 1535,manuscript,"The Museum of Islamic Art, Qatar","https://commons.wikimedia.org/wiki/File:Unknown,_Iran,_16th_Century_-_Page_from_the_Shahnama_-_Google_Art_Project.jpg",06,qatar_item,qatar,"/img/derivatives/iiif/images/obj7/full/250,/0/default.jpg",/img/derivatives/iiif/obj7/manifest.json,"/img/derivatives/iiif/images/obj7/full/1140,/0/default.jpg"
-obj8,Unknown,Iran,Silk Tapestry Depicting the story of Leila and Majnun,1550 - 1650,panel,"The Museum of Islamic Art, Qatar","https://commons.wikimedia.org/wiki/File:Unknown,_Iran,_16th_or_16th_Century_-_Silk_Tapestry_Depicting_the_story_of_Leila_and_Majnun_-_Google_Art_Project.jpg",07,qatar_item,qatar,"/img/derivatives/iiif/images/obj8/full/250,/0/default.jpg",/img/derivatives/iiif/obj8/manifest.json,"/img/derivatives/iiif/images/obj8/full/1140,/0/default.jpg"
-obj9,Mihr 'Ali,Iran,Portrait of Fath 'Ali Shah,1816,portrait,"The Museum of Islamic Art, Qatar","https://commons.wikimedia.org/wiki/File:Mihr_%27Ali,_Iran,_1816_-_Portrait_of_Fath_%27Ali_Shah_-_Google_Art_Project.jpg",08,qatar_item,qatar,"/img/derivatives/iiif/images/obj9/full/250,/0/default.jpg",/img/derivatives/iiif/obj9/manifest.json,"/img/derivatives/iiif/images/obj9/full/1140,/0/default.jpg"
-obj10,Unknown,Iran,Portrait of Hasan 'Ali Mirza Shuja al-Saltana,1800 - 1850,portrait,"The Museum of Islamic Art, Qatar","https://commons.wikimedia.org/wiki/File:Unknown,_Iran,_early_19th_Century_-_Portrait_of_Hasan_%27Ali_Mirza_Shuja_al-Saltana_-_Google_Art_Project.jpg",09,qatar_item,qatar,"/img/derivatives/iiif/images/obj10/full/250,/0/default.jpg",/img/derivatives/iiif/obj10/manifest.json,"/img/derivatives/iiif/images/obj10/full/1140,/0/default.jpg"
-obj11,Unknown,Iran,Portrait of Sheikh Ali Mirza,1800 - 1850,portrait,"The Museum of Islamic Art, Qatar","https://commons.wikimedia.org/wiki/File:Unknown,_Iran,_early_19th_Century_-_Portrait_of_Sheikh_Ali_Mirza_-_Google_Art_Project.jpg",10,qatar_item,qatar,"/img/derivatives/iiif/images/obj11/full/250,/0/default.jpg",/img/derivatives/iiif/obj11/manifest.json,"/img/derivatives/iiif/images/obj11/full/1140,/0/default.jpg"
-obj12,"Bahādur Fīrūz, ʻAbd Allāh Khān",Middle East and North Africa,Excerpt from 'The Book of Horses' (فَرَس نامه [رسالة في الخيول),Around 1628 - 1658,manuscript,Qatar National Library,https://www.wdl.org/en/item/10668/,11,qatar_item,qatar,"/img/derivatives/iiif/images/obj12_00/full/250,/0/default.jpg",/img/derivatives/iiif/obj12/manifest.json,"/img/derivatives/iiif/images/obj12_00/full/1140,/0/default.jpg"
+pid,artist,location,label,_date,object_type,current_location,source,order,layout,collection,thumbnail,full,manifest
+obj1,Al-Hajj Hafiz Muhammad Nuri,Turkey,The Dala'il al-Khayrat of al-Juzuli,1801,manuscript,"The Museum of Islamic Art, Qatar","https://commons.wikimedia.org/wiki/File:Al-Hajj_Hafiz_Muhammad_Nuri,_Turkey,_1801_-_The_Dala%27il_al-Khayrat_of_al-Juzuli_-_Google_Art_Project.jpg",00,qatar_item,qatar,"/img/derivatives/iiif/images/obj1/full/250,/0/default.jpg","/img/derivatives/iiif/images/obj1/full/1140,/0/default.jpg",/img/derivatives/iiif/obj1/manifest.json
+obj2,Unknown,Egypt,Sulwan Al-Muta'a,14th century,manuscript,"The Museum of Islamic Art, Qatar","https://commons.wikimedia.org/wiki/File:Unknown,_Egypt_or_Syria,_14th_Century_-_Sulwan_Al-Muta%27a_-_Google_Art_Project.jpg",01,qatar_item,qatar,"/img/derivatives/iiif/images/obj2/full/250,/0/default.jpg","/img/derivatives/iiif/images/obj2/full/1140,/0/default.jpg",/img/derivatives/iiif/obj2/manifest.json
+obj3,Unknown,Egypt,Map of the World,15th century,map,"The Museum of Islamic Art, Qatar","https://commons.wikimedia.org/wiki/File:Unknown,_Egypt,_15th_Century_-_Map_of_World_-_Google_Art_Project.jpg",02,qatar_item,qatar,"/img/derivatives/iiif/images/obj3/full/250,/0/default.jpg","/img/derivatives/iiif/images/obj3/full/1140,/0/default.jpg",/img/derivatives/iiif/obj3/manifest.json
+obj4,Unknown,Iran,"Faridun crosses the River Dijla, fol. 33v",1525 - 1535,manuscript,"The Museum of Islamic Art, Qatar","https://commons.wikimedia.org/wiki/File:Unknown,_Iran_-_Page_from_the_Shahnama_of_Shah_Tahmasp_-_Google_Art_Project.jpg",03,qatar_item,qatar,"/img/derivatives/iiif/images/obj4/full/250,/0/default.jpg","/img/derivatives/iiif/images/obj4/full/1140,/0/default.jpg",/img/derivatives/iiif/obj4/manifest.json
+obj5,Unknown,Iran,Panel from Iran,1600 - 1625,panel,"The Museum of Islamic Art, Qatar","https://commons.wikimedia.org/wiki/File:Unknown,_Iran_-_Panel_from_Iran_-_Google_Art_Project.jpg",04,qatar_item,qatar,"/img/derivatives/iiif/images/obj5/full/250,/0/default.jpg","/img/derivatives/iiif/images/obj5/full/1140,/0/default.jpg",/img/derivatives/iiif/obj5/manifest.json
+obj6,Unknown,Iran,Diwan of Jami Manuscript,16th century,manuscript,"The Museum of Islamic Art, Qatar","https://commons.wikimedia.org/wiki/File:Unknown,_Iran,_16th_Century_-_Diwan_of_Jami_Manuscript_-_Google_Art_Project.jpg",05,qatar_item,qatar,"/img/derivatives/iiif/images/obj6/full/250,/0/default.jpg","/img/derivatives/iiif/images/obj6/full/1140,/0/default.jpg",/img/derivatives/iiif/obj6/manifest.json
+obj7,Unknown,Iran,Page from the Shahnama,1525 - 1535,manuscript,"The Museum of Islamic Art, Qatar","https://commons.wikimedia.org/wiki/File:Unknown,_Iran,_16th_Century_-_Page_from_the_Shahnama_-_Google_Art_Project.jpg",06,qatar_item,qatar,"/img/derivatives/iiif/images/obj7/full/250,/0/default.jpg","/img/derivatives/iiif/images/obj7/full/1140,/0/default.jpg",/img/derivatives/iiif/obj7/manifest.json
+obj8,Unknown,Iran,Silk Tapestry Depicting the story of Leila and Majnun,1550 - 1650,panel,"The Museum of Islamic Art, Qatar","https://commons.wikimedia.org/wiki/File:Unknown,_Iran,_16th_or_16th_Century_-_Silk_Tapestry_Depicting_the_story_of_Leila_and_Majnun_-_Google_Art_Project.jpg",07,qatar_item,qatar,"/img/derivatives/iiif/images/obj8/full/250,/0/default.jpg","/img/derivatives/iiif/images/obj8/full/1140,/0/default.jpg",/img/derivatives/iiif/obj8/manifest.json
+obj9,Mihr 'Ali,Iran,Portrait of Fath 'Ali Shah,1816,portrait,"The Museum of Islamic Art, Qatar","https://commons.wikimedia.org/wiki/File:Mihr_%27Ali,_Iran,_1816_-_Portrait_of_Fath_%27Ali_Shah_-_Google_Art_Project.jpg",08,qatar_item,qatar,"/img/derivatives/iiif/images/obj9/full/250,/0/default.jpg","/img/derivatives/iiif/images/obj9/full/1140,/0/default.jpg",/img/derivatives/iiif/obj9/manifest.json
+obj10,Unknown,Iran,Portrait of Hasan 'Ali Mirza Shuja al-Saltana,1800 - 1850,portrait,"The Museum of Islamic Art, Qatar","https://commons.wikimedia.org/wiki/File:Unknown,_Iran,_early_19th_Century_-_Portrait_of_Hasan_%27Ali_Mirza_Shuja_al-Saltana_-_Google_Art_Project.jpg",09,qatar_item,qatar,"/img/derivatives/iiif/images/obj10/full/250,/0/default.jpg","/img/derivatives/iiif/images/obj10/full/1140,/0/default.jpg",/img/derivatives/iiif/obj10/manifest.json
+obj11,Unknown,Iran,Portrait of Sheikh Ali Mirza,1800 - 1850,portrait,"The Museum of Islamic Art, Qatar","https://commons.wikimedia.org/wiki/File:Unknown,_Iran,_early_19th_Century_-_Portrait_of_Sheikh_Ali_Mirza_-_Google_Art_Project.jpg",10,qatar_item,qatar,"/img/derivatives/iiif/images/obj11/full/250,/0/default.jpg","/img/derivatives/iiif/images/obj11/full/1140,/0/default.jpg",/img/derivatives/iiif/obj11/manifest.json
+obj12,"Bahādur Fīrūz, ʻAbd Allāh Khān",Middle East and North Africa,Excerpt from 'The Book of Horses' (فَرَس نامه [رسالة في الخيول),Around 1628 - 1658,manuscript,Qatar National Library,https://www.wdl.org/en/item/10668/,11,qatar_item,qatar,"/img/derivatives/iiif/images/obj12_00/full/250,/0/default.jpg","/img/derivatives/iiif/images/obj12_00/full/1140,/0/default.jpg",/img/derivatives/iiif/obj12/manifest.json

_exhibits/a.md

@@ -11,7 +11,7 @@ Ut eleifend lacus at erat efficitur bibendum. Ut laoreet elit nec dolor molestie
 Nam velit leo, mattis ac dui non, vulputate porttitor sapien. Praesent in aliquet dui. Nulla facilisi. Maecenas nulla ex, facilisis non aliquet ac, ultrices eu sem. Sed vel aliquet urna. Mauris quis ex at lectus iaculis elementum id id massa. Integer luctus nulla vel tellus rutrum, ac pulvinar erat finibus. Aliquam erat volutpat. Pellentesque vel velit sit amet mauris dignissim feugiat.
 
 
-{% include parallax_image.html collection='qatar' pid='obj12' y='50%' %}
+{% include parallax_image.html collection='qatar' pid='obj12' y='50%' clickable='true' %}
 
 
 Duis commodo ligula libero, a pharetra ligula posuere sit amet. Sed ipsum dolor, elementum eget nisl eget, sagittis vestibulum augue. Donec tincidunt mauris et nunc sagittis, nec consectetur lorem tristique. Nulla tincidunt magna ut ullamcorper consectetur. Nulla mi urna, feugiat sed massa non, ullamcorper efficitur dolor.[^2] Sed luctus, massa eget pharetra posuere, nibh sem eleifend lectus, lobortis molestie ante libero non metus. Aenean et est sit amet est pulvinar convallis vel non tortor. Nunc semper commodo fringilla. Proin eget metus eget felis faucibus aliquet. Cras ultrices turpis id nibh cursus fringilla. Aenean nec magna turpis. Suspendisse egestas tellus iaculis ante pharetra imperdiet ac at odio.
@@ -26,4 +26,4 @@ Duis finibus leo non velit viverra tincidunt. Fusce efficitur laoreet convallis.
 
 [^1]: Integer eu augue elementum, venenatis nisi vitae, ultrices magna. Nunc accumsan sem quis tristique iaculis. Quisque sed lorem tortor.
 
-[^2]: Nunc semper commodo fringilla. Proin eget metus eget felis faucibus aliquet. Cras ultrices turpis id nibh cursus fringilla. Aenean nec magna turpis. Suspendisse egestas tellus iaculis ante pharetra imperdiet ac at odio.
+[^2]: Nunc semper commodo fringilla. Proin eget metus eget felis faucibus aliquet. Cras ultrices turpis id nibh cursus fringilla. Aenean nec magna turpis. Suspendisse egestas tellus iaculis ante pharetra imperdiet ac at odio.

_exhibits/b.md

@@ -10,7 +10,7 @@ Ut eleifend lacus at erat efficitur bibendum. Ut laoreet elit nec dolor molestie
 
 Nam velit leo, mattis ac dui non, vulputate porttitor sapien. Praesent in aliquet dui. Nulla facilisi. Maecenas nulla ex, facilisis non aliquet ac, ultrices eu sem. Sed vel aliquet urna. Mauris quis ex at lectus iaculis elementum id id massa. Integer luctus nulla vel tellus rutrum, ac pulvinar erat finibus. Aliquam erat volutpat. Pellentesque vel velit sit amet mauris dignissim feugiat.
 
-{% include inline_image.html collection='qatar' pid='obj7' %}
+{% include inline_image.html collection='qatar' pid='obj7' clickable='true' %}
 
 Duis commodo ligula libero, a pharetra ligula posuere sit amet. Sed ipsum dolor, elementum eget nisl eget, sagittis vestibulum augue. Donec tincidunt mauris et nunc sagittis, nec consectetur lorem tristique. Nulla tincidunt magna ut ullamcorper consectetur. Nulla mi urna, feugiat sed massa non, ullamcorper efficitur dolor. Sed luctus, massa eget pharetra posuere, nibh sem eleifend lectus, lobortis molestie ante libero non metus. Aenean et est sit amet est pulvinar convallis vel non tortor. Nunc semper commodo fringilla. Proin eget metus eget felis faucibus aliquet. Cras ultrices turpis id nibh cursus fringilla. Aenean nec magna turpis. Suspendisse egestas tellus iaculis ante pharetra imperdiet ac at odio.