Merge pull request minicomp#91 from minicomp/v1.0.1

V1.0.1
ej2432 · Sep 16, 2020 · caa479d · caa479d
2 parents adbc2da + 8d5d0df
commit caa479d
Show file tree

Hide file tree

Showing 2,563 changed files with 203 additions and 328 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,14 @@
+# jekyll things
 _site
 .sass-cache
 .jekyll-metadata
+.jekyll-cache
+
+# system things
 .DS_Store
+
+# ruby things
 Gemfile.lock
-package-lock.json
+
+# wax things
+wax_tasks
diff --git a/.travis.yml b/.travis.yml
@@ -8,5 +8,9 @@ before_install:
   - docker ps -a
 script:
   - docker exec -it wax bash -l -c "bundle exec rake --tasks;"
+  - docker exec -it wax bash -l -c "bundle exec rake wax:clobber qatar;"
+  - docker exec -it wax bash -l -c "bundle exec rake wax:iiif qatar;"
+  - docker exec -it wax bash -l -c "bundle exec rake wax:pages qatar;"
+  - docker exec -it wax bash -l -c "bundle exec rake wax:search main;"
   - docker exec -it wax bash -l -c "bundle exec jekyll build -d _site/wax && bundle exec rake wax:test;"
   - docker stop $(docker ps -aq)
diff --git a/_data/qatar.csv b/_data/qatar.csv
@@ -1,13 +1,13 @@
-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/full/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/full/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/full/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/full/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/full/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/full/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/full/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/full/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/full/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/full/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/full/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/full/0/default.jpg,/img/derivatives/iiif/obj12/manifest.json
+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"
diff --git a/_qatar/obj1.md b/_qatar/obj1.md
@@ -11,6 +11,6 @@ order: '00'
 layout: qatar_item
 collection: qatar
 thumbnail: "/img/derivatives/iiif/images/obj1/full/250,/0/default.jpg"
-full: "/img/derivatives/iiif/images/obj1/full/full/0/default.jpg"
 manifest: "/img/derivatives/iiif/obj1/manifest.json"
+full: "/img/derivatives/iiif/images/obj1/full/1140,/0/default.jpg"
 ---
diff --git a/_qatar/obj10.md b/_qatar/obj10.md
@@ -11,6 +11,6 @@ order: '09'
 layout: qatar_item
 collection: qatar
 thumbnail: "/img/derivatives/iiif/images/obj10/full/250,/0/default.jpg"
-full: "/img/derivatives/iiif/images/obj10/full/full/0/default.jpg"
 manifest: "/img/derivatives/iiif/obj10/manifest.json"
+full: "/img/derivatives/iiif/images/obj10/full/1140,/0/default.jpg"
 ---
diff --git a/_qatar/obj11.md b/_qatar/obj11.md
@@ -11,6 +11,6 @@ order: '10'
 layout: qatar_item
 collection: qatar
 thumbnail: "/img/derivatives/iiif/images/obj11/full/250,/0/default.jpg"
-full: "/img/derivatives/iiif/images/obj11/full/full/0/default.jpg"
 manifest: "/img/derivatives/iiif/obj11/manifest.json"
+full: "/img/derivatives/iiif/images/obj11/full/1140,/0/default.jpg"
 ---
diff --git a/_qatar/obj12.md b/_qatar/obj12.md
@@ -11,6 +11,6 @@ order: '11'
 layout: qatar_item
 collection: qatar
 thumbnail: "/img/derivatives/iiif/images/obj12_00/full/250,/0/default.jpg"
-full: "/img/derivatives/iiif/images/obj12_00/full/full/0/default.jpg"
 manifest: "/img/derivatives/iiif/obj12/manifest.json"
+full: "/img/derivatives/iiif/images/obj12_00/full/1140,/0/default.jpg"
 ---
diff --git a/_qatar/obj2.md b/_qatar/obj2.md
@@ -11,6 +11,6 @@ order: '01'
 layout: qatar_item
 collection: qatar
 thumbnail: "/img/derivatives/iiif/images/obj2/full/250,/0/default.jpg"
-full: "/img/derivatives/iiif/images/obj2/full/full/0/default.jpg"
 manifest: "/img/derivatives/iiif/obj2/manifest.json"
+full: "/img/derivatives/iiif/images/obj2/full/1140,/0/default.jpg"
 ---
diff --git a/_qatar/obj3.md b/_qatar/obj3.md
@@ -11,6 +11,6 @@ order: '02'
 layout: qatar_item
 collection: qatar
 thumbnail: "/img/derivatives/iiif/images/obj3/full/250,/0/default.jpg"
-full: "/img/derivatives/iiif/images/obj3/full/full/0/default.jpg"
 manifest: "/img/derivatives/iiif/obj3/manifest.json"
+full: "/img/derivatives/iiif/images/obj3/full/1140,/0/default.jpg"
 ---
diff --git a/_qatar/obj4.md b/_qatar/obj4.md
@@ -11,6 +11,6 @@ order: '03'
 layout: qatar_item
 collection: qatar
 thumbnail: "/img/derivatives/iiif/images/obj4/full/250,/0/default.jpg"
-full: "/img/derivatives/iiif/images/obj4/full/full/0/default.jpg"
 manifest: "/img/derivatives/iiif/obj4/manifest.json"
+full: "/img/derivatives/iiif/images/obj4/full/1140,/0/default.jpg"
 ---
diff --git a/_qatar/obj5.md b/_qatar/obj5.md
@@ -11,6 +11,6 @@ order: '04'
 layout: qatar_item
 collection: qatar
 thumbnail: "/img/derivatives/iiif/images/obj5/full/250,/0/default.jpg"
-full: "/img/derivatives/iiif/images/obj5/full/full/0/default.jpg"
 manifest: "/img/derivatives/iiif/obj5/manifest.json"
+full: "/img/derivatives/iiif/images/obj5/full/1140,/0/default.jpg"
 ---
diff --git a/_qatar/obj6.md b/_qatar/obj6.md
@@ -11,6 +11,6 @@ order: '05'
 layout: qatar_item
 collection: qatar
 thumbnail: "/img/derivatives/iiif/images/obj6/full/250,/0/default.jpg"
-full: "/img/derivatives/iiif/images/obj6/full/full/0/default.jpg"
 manifest: "/img/derivatives/iiif/obj6/manifest.json"
+full: "/img/derivatives/iiif/images/obj6/full/1140,/0/default.jpg"
 ---
diff --git a/_qatar/obj7.md b/_qatar/obj7.md
@@ -11,6 +11,6 @@ order: '06'
 layout: qatar_item
 collection: qatar
 thumbnail: "/img/derivatives/iiif/images/obj7/full/250,/0/default.jpg"
-full: "/img/derivatives/iiif/images/obj7/full/full/0/default.jpg"
 manifest: "/img/derivatives/iiif/obj7/manifest.json"
+full: "/img/derivatives/iiif/images/obj7/full/1140,/0/default.jpg"
 ---
diff --git a/_qatar/obj8.md b/_qatar/obj8.md
@@ -11,6 +11,6 @@ order: '07'
 layout: qatar_item
 collection: qatar
 thumbnail: "/img/derivatives/iiif/images/obj8/full/250,/0/default.jpg"
-full: "/img/derivatives/iiif/images/obj8/full/full/0/default.jpg"
 manifest: "/img/derivatives/iiif/obj8/manifest.json"
+full: "/img/derivatives/iiif/images/obj8/full/1140,/0/default.jpg"
 ---
diff --git a/_qatar/obj9.md b/_qatar/obj9.md
@@ -11,6 +11,6 @@ order: '08'
 layout: qatar_item
 collection: qatar
 thumbnail: "/img/derivatives/iiif/images/obj9/full/250,/0/default.jpg"
-full: "/img/derivatives/iiif/images/obj9/full/full/0/default.jpg"
 manifest: "/img/derivatives/iiif/obj9/manifest.json"
+full: "/img/derivatives/iiif/images/obj9/full/1140,/0/default.jpg"
 ---
diff --git a/img/derivatives/iiif/annotation/obj12_06.json b/img/derivatives/iiif/annotation/obj12_06.json
diff --git a/img/derivatives/iiif/annotation/obj12_07.json b/img/derivatives/iiif/annotation/obj12_07.json
diff --git a/img/derivatives/iiif/annotation/obj12_08.json b/img/derivatives/iiif/annotation/obj12_08.json
diff --git a/img/derivatives/iiif/annotation/obj12_09.json b/img/derivatives/iiif/annotation/obj12_09.json
diff --git a/img/derivatives/iiif/canvas/obj12_02.json b/img/derivatives/iiif/canvas/obj12_02.json
@@ -4,7 +4,7 @@ layout: none
 {
   "@type": "sc:Canvas",
   "@id": "{{ '/' | absolute_url }}img/derivatives/iiif/canvas/obj12_02.json",
-  "label": "Page 4",
+  "label": "Page 3",
   "width": 5379,
   "height": 7500,
   "thumbnail": "{{ '/' | absolute_url }}img/derivatives/iiif/images/obj12_02/full/250,/0/default.jpg",

diff --git a/img/derivatives/iiif/canvas/obj12_03.json b/img/derivatives/iiif/canvas/obj12_03.json
@@ -4,7 +4,7 @@ layout: none
 {
   "@type": "sc:Canvas",
   "@id": "{{ '/' | absolute_url }}img/derivatives/iiif/canvas/obj12_03.json",
-  "label": "Page 3",
+  "label": "Page 4",
   "width": 5388,
   "height": 7500,
   "thumbnail": "{{ '/' | absolute_url }}img/derivatives/iiif/images/obj12_03/full/250,/0/default.jpg",

diff --git a/img/derivatives/iiif/canvas/obj12_04.json b/img/derivatives/iiif/canvas/obj12_04.json
@@ -4,7 +4,7 @@ layout: none
 {
   "@type": "sc:Canvas",
   "@id": "{{ '/' | absolute_url }}img/derivatives/iiif/canvas/obj12_04.json",
-  "label": "Page 6",
+  "label": "Page 5",
   "width": 5358,
   "height": 7500,
   "thumbnail": "{{ '/' | absolute_url }}img/derivatives/iiif/images/obj12_04/full/250,/0/default.jpg",

diff --git a/img/derivatives/iiif/canvas/obj12_05.json b/img/derivatives/iiif/canvas/obj12_05.json
@@ -4,7 +4,7 @@ layout: none
 {
   "@type": "sc:Canvas",
   "@id": "{{ '/' | absolute_url }}img/derivatives/iiif/canvas/obj12_05.json",
-  "label": "Page 5",
+  "label": "Page 6",
   "width": 5213,
   "height": 7500,
   "thumbnail": "{{ '/' | absolute_url }}img/derivatives/iiif/images/obj12_05/full/250,/0/default.jpg",