Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add islandora_mirador submodule #10

Merged
merged 41 commits into from
Sep 4, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
878c286
add islandora_mirador submodule
elizoller Sep 18, 2019
85bffc4
cleanup
elizoller Sep 18, 2019
e02663e
add token as dependency
elizoller Sep 23, 2019
3052d5f
missing doc comment
elizoller Sep 23, 2019
2077476
fix token in the config form
elizoller Sep 23, 2019
d5a52ff
add a taxonomy term for mirador display
elizoller Sep 23, 2019
34b7d68
fix spacing in css file for phpcs
elizoller Sep 23, 2019
340d283
Merge remote-tracking branch 'upstream/8.x-1.x' into mirador
elizoller Sep 23, 2019
8f11a92
add context config
elizoller Sep 23, 2019
af70927
fix the URIs for mirador
elizoller Jul 1, 2020
e3a3c5d
Merge branch '8.x-1.x' into pull/10
elizoller Aug 3, 2020
d5bd1f7
separate the book manifest and the single item manifest
elizoller Aug 9, 2020
aa9f3a1
separate context for single item mirador vs book mirador
elizoller Aug 9, 2020
963a4f1
add additional template
elizoller Aug 9, 2020
c93613c
add field formatter for single item to go with evas
elizoller Aug 9, 2020
32bf7cd
add mirador evas view
elizoller Aug 9, 2020
3b1a58d
add islandora mirador config
elizoller Aug 9, 2020
9797642
add variable for new twig
elizoller Aug 9, 2020
88143d3
add entity view modes for mirador
elizoller Aug 9, 2020
9a24f49
phpcs fixes
elizoller Aug 10, 2020
6abf217
more php formatting issues
elizoller Aug 10, 2020
12e368b
fixing name of configs
elizoller Aug 13, 2020
fe83421
add file media mirador view mode
elizoller Aug 14, 2020
23f962d
Merge branch 'mirador' of https://github.com/asulibraries/islandora_d…
elizoller Aug 14, 2020
5418f72
hide mirador evas in all the view modes that aren't mirador
elizoller Aug 20, 2020
84dfe0e
default to service files because they seem more reliable
elizoller Aug 20, 2020
c387e5a
fixes for phpcs Drupal and DrupalPractice standards
elizoller Aug 27, 2020
8f59448
missing translate
elizoller Aug 27, 2020
e7f463f
additional cleanup
elizoller Aug 27, 2020
aab949f
Merge branch '8.x-1.x' into mirador
elizoller Aug 28, 2020
4a8a86b
replace local min.js for cdn version
elizoller Aug 28, 2020
64631e0
remove library from header since its loaded by the templates
elizoller Aug 28, 2020
82cc336
reduce to one template since they were identical
elizoller Aug 28, 2020
2a2af83
pass an id to the template
elizoller Aug 28, 2020
d4a34a0
remove duplicate template, add a unique HTML id per viewer
elizoller Aug 28, 2020
fb9b8ae
pass unique html to template and use a class instead of an id to set …
elizoller Aug 28, 2020
9d96560
reference unique html id in the base
elizoller Aug 28, 2020
45d486c
instead of getting the node from the routeParams, traverse up from th…
elizoller Sep 1, 2020
8117e68
add caching based on node:id and media_list
elizoller Sep 2, 2020
8120769
fix missing dependency
elizoller Sep 3, 2020
4ed3b6a
fix dependency name
elizoller Sep 3, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions config/install/context.context.openseadragon_block.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,10 @@ conditions:
id: node_has_term
negate: 0
uuid: e5689bd5-7eec-4378-b329-2f35d5bb35b0
uri: 'https://schema.org/Book'
uri: 'http://openseadragon.github.io,https://schema.org/Book'
context_mapping:
node: '@node.node_route_context:node'
logic: and
reactions:
blocks:
blocks:
Expand All @@ -27,7 +28,7 @@ reactions:
label_display: 0
region: content
weight: '-1'
iiif_manifest_url: 'http://localhost:8000/node/[node:nid]/manifest'
iiif_manifest_url: 'http://localhost:8000/node/[node:nid]/book-manifest'
context_mapping: { }
theme: carapace
css_class: ''
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -327,6 +327,9 @@ hidden:
field_pid: true
field_weight: true
langcode: true
mirador_evas_entity_view_1: true
mirador_evas_entity_view_2: true
mirador_evas_entity_view_3: true
openseadragon_media_evas_entity_view_1: true
openseadragon_media_evas_entity_view_2: true
openseadragon_media_evas_service_file: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -320,9 +320,12 @@ hidden:
field_pid: true
field_weight: true
langcode: true
mirador_evas_entity_view_1: true
mirador_evas_entity_view_2: true
mirador_evas_entity_view_3: true
openseadragon_media_evas_entity_view_1: true
openseadragon_media_evas_entity_view_2: true
openseadragon_media_evas_service_file: true
pdfjs_media_evas_entity_view_1: true
pdfjs_media_evas_entity_view_2: true
pdfjs_media_evas_service_file: true
pdfjs_media_evas_service_file: true
Original file line number Diff line number Diff line change
Expand Up @@ -328,6 +328,9 @@ hidden:
field_pid: true
field_weight: true
langcode: true
mirador_evas_entity_view_1: true
mirador_evas_entity_view_2: true
mirador_evas_entity_view_3: true
openseadragon_media_evas_entity_view_2: true
openseadragon_media_evas_service_file: true
pdfjs_media_evas_entity_view_1: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -323,6 +323,9 @@ hidden:
field_pid: true
field_weight: true
langcode: true
mirador_evas_entity_view_1: true
mirador_evas_entity_view_2: true
mirador_evas_entity_view_3: true
openseadragon_media_evas_entity_view_1: true
openseadragon_media_evas_entity_view_2: true
openseadragon_media_evas_service_file: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,9 @@ hidden:
field_weight: true
langcode: true
members_eva_entity_view_1: true
mirador_evas_entity_view_1: true
mirador_evas_entity_view_2: true
mirador_evas_entity_view_3: true
openseadragon_media_evas_entity_view_1: true
openseadragon_media_evas_entity_view_2: true
openseadragon_media_evas_service_file: true
Expand Down
157 changes: 156 additions & 1 deletion config/install/views.view.iiif_manifest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ description: 'Generates IIIF manifests for paged content'
tag: ''
base_table: media_field_data
base_field: mid
core: 8.x
display:
default:
display_plugin: default
Expand Down Expand Up @@ -220,6 +219,8 @@ display:
id: status
expose:
operator: ''
operator_limit_selection: false
operator_list: { }
group: 1
field_external_uri_uri:
id: field_external_uri_uri
Expand All @@ -238,6 +239,8 @@ display:
description: ''
use_operator: false
operator: ''
operator_limit_selection: false
operator_list: { }
identifier: ''
required: false
remember: false
Expand Down Expand Up @@ -354,6 +357,41 @@ display:
id: rest_export_1
display_title: 'REST export'
position: 1
display_options:
display_extenders: { }
path: node/%node/book-manifest
pager:
type: none
options:
offset: 0
style:
type: iiif_manifest
options:
iiif_tile_field:
field_media_file: field_media_file
field_media_image: field_media_image
row:
type: data_field
options:
field_options:
name:
alias: ''
raw_output: false
cache_metadata:
max-age: -1
contexts:
- 'languages:language_content'
- 'languages:language_interface'
- url
- user.permissions
tags:
- 'config:field.storage.media.field_media_file'
- 'config:field.storage.media.field_media_image'
rest_export_2:
display_plugin: rest_export
id: rest_export_2
display_title: 'REST export - single node'
position: 1
display_options:
display_extenders: { }
path: node/%node/manifest
Expand All @@ -374,6 +412,123 @@ display:
name:
alias: ''
raw_output: false
display_description: ''
arguments:
field_media_of_target_id:
id: field_media_of_target_id
table: media__field_media_of
field: field_media_of_target_id
relationship: none
group_type: group
admin_label: ''
default_action: default
exception:
value: all
title_enable: false
title: All
title_enable: false
title: ''
default_argument_type: node
default_argument_options: { }
default_argument_skip_url: false
summary_options:
base_path: ''
count: true
items_per_page: 25
override: false
summary:
sort_order: asc
number_of_records: 0
format: default_summary
specify_validation: false
validate:
type: none
fail: 'not found'
validate_options: { }
break_phrase: false
not: false
plugin_id: numeric
defaults:
arguments: false
relationships: false
filters: false
filter_groups: false
relationships:
field_media_of:
id: field_media_of
table: media__field_media_of
field: field_media_of
relationship: none
group_type: group
admin_label: 'field_media_of: Content'
required: true
plugin_id: standard
field_media_use:
id: field_media_use
table: media__field_media_use
field: field_media_use
relationship: none
group_type: group
admin_label: 'field_media_use: Taxonomy term'
required: false
plugin_id: standard
filters:
status:
value: '1'
table: media_field_data
field: status
plugin_id: boolean
entity_type: media
entity_field: status
id: status
expose:
operator: ''
operator_limit_selection: false
operator_list: { }
group: 1
field_external_uri_uri:
id: field_external_uri_uri
table: taxonomy_term__field_external_uri
field: field_external_uri_uri
relationship: field_media_use
group_type: group
admin_label: ''
operator: '='
value: 'http://pcdm.org/use#ServiceFile'
group: 1
exposed: false
expose:
operator_id: ''
label: ''
description: ''
use_operator: false
operator: ''
operator_limit_selection: false
operator_list: { }
identifier: ''
required: false
remember: false
multiple: false
remember_roles:
authenticated: authenticated
placeholder: ''
is_grouped: false
group_info:
label: ''
description: ''
identifier: ''
optional: true
widget: select
multiple: false
remember: false
default_group: All
default_group_multiple: { }
group_items: { }
plugin_id: string
filter_groups:
operator: AND
groups:
1: AND
cache_metadata:
max-age: -1
contexts:
Expand Down
1 change: 1 addition & 0 deletions migrate/tags.csv
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
vid,name,description,external_uri
islandora_display,"Open Seadragon","Display using the Open Seadragon viewer",http://openseadragon.github.io
islandora_display,"PDFjs","Display using the PDF.js viewer",http://mozilla.github.io/pdf.js
islandora_display,"Mirador","Display using the Mirador viewer",https://projectmirador.org
resource_types,"Collection","An aggregation of resources",http://purl.org/dc/dcmitype/Collection
resource_types,"Dataset","Data encoded in a defined structure",http://purl.org/dc/dcmitype/Dataset
resource_types,"Image","A visual representation other than text",http://purl.org/dc/dcmitype/Image
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
langcode: en
status: true
dependencies:
module:
- islandora
name: mirador
label: Mirador
group: Display
description: 'Context for enabling mirador viewer on select nodes'
requireAllConditions: false
disabled: false
conditions:
node_has_term:
id: node_has_term
negate: 0
tids:
-
target_id: '31'
uri: 'https://projectmirador.org'
context_mapping:
node: '@node.node_route_context:node'
logic: and
reactions:
view_mode_alter:
id: view_mode_alter
mode: node.mirador
saved: false
weight: 0
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
langcode: en
status: true
dependencies:
module:
- islandora
name: paged_content_mirador
label: 'Paged Content - Mirador'
group: Display
description: 'Displayed paged content with Mirador'
requireAllConditions: false
disabled: false
conditions:
node_has_term:
id: node_has_term
logic: and
negate: 0
uuid: d43d2644-848e-46e7-a3ff-2023277aacc3
uri: 'https://schema.org/Book,https://projectmirador.org'
context_mapping:
node: '@node.node_route_context:node'
reactions:
blocks:
blocks:
63a09ad0-d622-46db-abd7-f24c9b89688c:
id: mirador_block
label: 'Mirador block'
provider: islandora_mirador
label_display: visible
region: content
weight: '0'
iiif_manifest_url: 'http://localhost:8000/node/[node:nid]/book-manifest'
context_mapping: { }
theme: carapace
css_class: ''
unique: 0
context_id: paged_content_mirador
uuid: 63a09ad0-d622-46db-abd7-f24c9b89688c
id: blocks
saved: false
uuid: 89895eb1-11ad-4ffa-8eeb-82a1bd4f304d
include_default_blocks: 1
weight: 0
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
langcode: en
status: true
dependencies:
config:
- core.entity_view_mode.media.mirador
- field.field.media.file.field_access_terms
- field.field.media.file.field_file_size
- field.field.media.file.field_media_file
- field.field.media.file.field_media_of
- field.field.media.file.field_media_use
- field.field.media.file.field_mime_type
- field.field.media.file.field_original_name
- media.type.file
module:
- islandora_mirador
id: media.file.mirador
targetEntityType: media
bundle: file
mode: mirador
content:
field_media_file:
label: visually_hidden
settings: { }
third_party_settings: { }
type: mirador_image
weight: 0
region: content
hidden:
created: true
field_access_terms: true
field_file_size: true
field_gemini_uri: true
field_media_of: true
field_media_use: true
field_mime_type: true
field_original_name: true
langcode: true
name: true
search_api_excerpt: true
thumbnail: true
uid: true
Loading