diff --git a/Module.php b/Module.php index 276abe9..beec1c4 100644 --- a/Module.php +++ b/Module.php @@ -12,6 +12,7 @@ class Module extends AbstractModule const MEDIA_TYPE = [ 'video' => 'Video', 'audio' => 'Audio', + 'image' => 'Image', ]; const RATIOS = [ diff --git a/README.md b/README.md index 4d1360c..537f98a 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,7 @@ # Archive.org media for Omeka S -[Archive.org media] is a module for [Omeka S] that integrates [Archive.org] media. +[Archive.org media] is a module for [Omeka S] that integrates [Archive.org] +video and audio media. ## Install diff --git a/asset/css/panoramaviewer.css b/asset/css/archiveOrg.css similarity index 82% rename from asset/css/panoramaviewer.css rename to asset/css/archiveOrg.css index 24b6e1f..59c4481 100644 --- a/asset/css/panoramaviewer.css +++ b/asset/css/archiveOrg.css @@ -1,6 +1,6 @@ /* Panaorama viewer custom */ @media screen { - .panorama-viewer { + .archive_org { /* width: 600px; */ /* height: 400px; */ } diff --git a/src/Form/ArchiveOrgBlockForm.php b/src/Form/ArchiveOrgBlockForm.php index 3e07061..7d950c9 100644 --- a/src/Form/ArchiveOrgBlockForm.php +++ b/src/Form/ArchiveOrgBlockForm.php @@ -31,7 +31,7 @@ class ArchiveOrgBlockForm extends Form 'name' => 'o:block[__blockIndex__][o:data][width]', 'type' => Element\Number::class, 'options' => [ - 'label' => 'Video width in pixels', + 'label' => 'Width in pixels', ], 'attributes' => [ 'min' => '100', @@ -42,7 +42,7 @@ class ArchiveOrgBlockForm extends Form 'name' => 'o:block[__blockIndex__][o:data][ratio]', 'type' => Element\Select::class, 'options' => [ - 'label' => 'Video ratio', + 'label' => 'Ratio', 'value_options' => Module::RATIOS, ], ]); diff --git a/src/Site/BlockLayout/ArchiveOrg.php b/src/Site/BlockLayout/ArchiveOrg.php index cc879bc..da9dcd5 100644 --- a/src/Site/BlockLayout/ArchiveOrg.php +++ b/src/Site/BlockLayout/ArchiveOrg.php @@ -56,7 +56,8 @@ class ArchiveOrg extends AbstractBlockLayout $html = ''; $html .= $view->blockAttachmentsForm($block); - $html .= '

' . $view->translate('Options'). '

'; + $html .= '

'; + $html .= $view->translate('Options'). '

'; $html .= '
'; $html .= $view->formCollection($form); $html .= '
'; diff --git a/view/common/block-layout/archiveOrg.phtml b/view/common/block-layout/archiveOrg.phtml index 2b5cdf2..4fb4f5d 100644 --- a/view/common/block-layout/archiveOrg.phtml +++ b/view/common/block-layout/archiveOrg.phtml @@ -1,43 +1,29 @@ -
+
%s

', $title); + $title = sprintf('

%s

', $title); } else { $title = false; } ?> + - -
- - - - - - - - +