Merge branch 'master' into integrate-3d-js-viewer
This commit is contained in:
commit
bb0a1525a3
|
@ -11,7 +11,7 @@ Usage: sphinx.sh <command> [options]
|
|||
|
||||
Commands:
|
||||
i, install Install Sphinx in a virtualenv
|
||||
s, serve Serve documentation. Options are forwared to sphinx-autobuild.
|
||||
s, serve Serve documentation. Options are forwarded to sphinx-autobuild.
|
||||
-H <host> Server host
|
||||
-p <port> Server port
|
||||
-a Write all files (from sphinx-build)
|
||||
|
|
|
@ -81,7 +81,7 @@ class BaseCommand extends Command
|
|||
/**
|
||||
* Initialize the extbase repository based on the given storagePid.
|
||||
*
|
||||
* TYPO3 10+: Find a better solution e.g. based on Symfonie Dependancy Injection.
|
||||
* TYPO3 10+: Find a better solution e.g. based on Symfonie Dependency Injection.
|
||||
*
|
||||
* @param int $storagePid The storage pid
|
||||
*
|
||||
|
|
|
@ -714,7 +714,7 @@ abstract class Doc
|
|||
}
|
||||
|
||||
/**
|
||||
* Traverse a logical (sub-) structure tree to find the structure with the requested logical id and return it's depth.
|
||||
* Traverse a logical (sub-) structure tree to find the structure with the requested logical id and return its depth.
|
||||
*
|
||||
* @access protected
|
||||
*
|
||||
|
@ -767,7 +767,7 @@ abstract class Doc
|
|||
protected abstract function init($location);
|
||||
|
||||
/**
|
||||
* Reuse any document object that might have been already loaded to determine wether document is METS or IIIF
|
||||
* Reuse any document object that might have been already loaded to determine whether document is METS or IIIF
|
||||
*
|
||||
* @access protected
|
||||
*
|
||||
|
|
|
@ -219,7 +219,7 @@ final class IiifManifest extends Doc
|
|||
protected $useGrps = [];
|
||||
|
||||
/**
|
||||
* IiifManifest also populates the physical stucture array entries for matching
|
||||
* IiifManifest also populates the physical structure array entries for matching
|
||||
* 'fileGrp's. To do that, the configuration has to be loaded; afterwards configured
|
||||
* 'fileGrp's for thumbnails, downloads, audio, fulltext and the 'fileGrp's for images
|
||||
* can be requested with this method.
|
||||
|
@ -452,7 +452,7 @@ final class IiifManifest extends Doc
|
|||
if (!$recursive) {
|
||||
$details = $this->getLogicalStructureInfo($logUnits[0]);
|
||||
} else {
|
||||
// cache the ranges - they might occure multiple times in the structures "tree" - with full data as well as referenced as id
|
||||
// cache the ranges - they might occur multiple times in the structures "tree" - with full data as well as referenced as id
|
||||
$processedStructures = [];
|
||||
foreach ($logUnits as $logUnit) {
|
||||
if (array_search($logUnit->getId(), $processedStructures) == false) {
|
||||
|
|
|
@ -17,7 +17,7 @@ use Kitodo\Dlf\Common\SolrSearchResult\Page;
|
|||
use Kitodo\Dlf\Common\SolrSearchResult\Region;
|
||||
|
||||
/**
|
||||
* ResultDocument class for the 'dlf' extension. It keeps te result of the search in the SOLR index.
|
||||
* ResultDocument class for the 'dlf' extension. It keeps the result of the search in the SOLR index.
|
||||
*
|
||||
* @author Beatrycze Volk <beatrycze.volk@slub-dresden.de>
|
||||
* @package TYPO3
|
||||
|
|
|
@ -86,7 +86,7 @@ class BasketController extends AbstractController
|
|||
}
|
||||
|
||||
/**
|
||||
* Different actions which depends on the choosen action (form)
|
||||
* Different actions which depends on the chosen action (form)
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
|
@ -217,7 +217,7 @@ class BasketController extends AbstractController
|
|||
|
||||
$basket = $this->basketRepository->findOneBySessionId($sessionId);
|
||||
}
|
||||
// session doesnt exists
|
||||
// session does not exist
|
||||
if ($basket === null) {
|
||||
// create new basket in db
|
||||
$basket = GeneralUtility::makeInstance(Basket::class);
|
||||
|
|
|
@ -387,14 +387,14 @@ class OaiPmhController extends AbstractController
|
|||
$this->logger->notice('Incomplete plugin configuration');
|
||||
}
|
||||
|
||||
$oaiIdentifyInfo['oai_label'] = $library->getOaiLabel();
|
||||
$oaiIdentifyInfo['oai_label'] = $library ? $library->getOaiLabel() : '';
|
||||
// Use default values for an installation with incomplete plugin configuration.
|
||||
if (empty($oaiIdentifyInfo['oai_label'])) {
|
||||
$oaiIdentifyInfo['oai_label'] = 'Kitodo.Presentation OAI-PMH Interface (default configuration)';
|
||||
$this->logger->notice('Incomplete plugin configuration (oai_label is missing)');
|
||||
}
|
||||
|
||||
$oaiIdentifyInfo['contact'] = $library->getContact();
|
||||
$oaiIdentifyInfo['contact'] = $library ? $library->getContact() : '';
|
||||
if (empty($oaiIdentifyInfo['contact'])) {
|
||||
$oaiIdentifyInfo['contact'] = 'unknown@example.org';
|
||||
$this->logger->notice('Incomplete plugin configuration (contact is missing)');
|
||||
|
|
|
@ -202,7 +202,7 @@ class PageViewController extends AbstractController
|
|||
$annotationContainers = [];
|
||||
/*
|
||||
* TODO Analyzing the annotations on the server side requires loading the annotation lists / pages
|
||||
* just to determine wether they contain text annotations for painting. This will take time and lead to a bad user experience.
|
||||
* just to determine whether they contain text annotations for painting. This will take time and lead to a bad user experience.
|
||||
* It would be better to link every annotation and analyze the data on the client side.
|
||||
*
|
||||
* On the other hand, server connections are potentially better than client connections. Downloading annotation lists
|
||||
|
|
|
@ -180,7 +180,7 @@ Update CSP
|
|||
----------
|
||||
|
||||
In Kitodo.Presentation 4.0, the way how static images are loaded has changed.
|
||||
Plase make sure that ``blob:`` URLs are not forbidden by your Content Security Policy.
|
||||
Please make sure that ``blob:`` URLs are not forbidden by your Content Security Policy.
|
||||
|
||||
Other Changes
|
||||
-------------
|
||||
|
|
|
@ -107,7 +107,7 @@ The command `kitodo:index` is used for indexing a single document::
|
|||
:Required:
|
||||
no
|
||||
:Description:
|
||||
Do not output any message. Usefull when using a wrapper script. The
|
||||
Do not output any message. Useful when using a wrapper script. The
|
||||
script may check the return value of the CLI job. This is always 0 on
|
||||
success and 1 on failure.
|
||||
:Example:
|
||||
|
@ -215,7 +215,7 @@ collections or even to reindex all documents on the given page.::
|
|||
:Required:
|
||||
no
|
||||
:Description:
|
||||
Do not output any message. Usefull when using a wrapper script. The
|
||||
Do not output any message. Useful when using a wrapper script. The
|
||||
script may check the return value of the CLI job. This is always 0 on
|
||||
success and 1 on failure.
|
||||
:Example:
|
||||
|
@ -229,7 +229,7 @@ collections or even to reindex all documents on the given page.::
|
|||
amount of processed/all documents.
|
||||
:Example:
|
||||
|
||||
Harvest OAI-OMH interface
|
||||
Harvest OAI-PMH interface
|
||||
-------------------------
|
||||
|
||||
With the command `kitodo:harvest` it is possible to harvest an OAI-PMH
|
||||
|
@ -332,7 +332,7 @@ OAI-PMH base URL (e.g. https://digital.slub-dresden.de/oai/).
|
|||
:Required:
|
||||
no
|
||||
:Description:
|
||||
Do not output any message. Usefull when using a wrapper script. The
|
||||
Do not output any message. Useful when using a wrapper script. The
|
||||
script may check the return value of the CLI job. This is always 0 on
|
||||
success and 1 on failure.
|
||||
:Example:
|
||||
|
|
|
@ -5,10 +5,6 @@
|
|||
<generator>LFEditor</generator>
|
||||
</header>
|
||||
<body>
|
||||
<trans-unit id="AddToBasket" approved="yes">
|
||||
<source><![CDATA[Add to basket]]></source>
|
||||
<target><![CDATA[Zum Warenkorb hinzufügen]]></target>
|
||||
</trans-unit>
|
||||
<trans-unit id="backXPages" approved="yes">
|
||||
<source><![CDATA[Back %s Pages]]></source>
|
||||
<target><![CDATA[%s Seiten zurück]]></target>
|
||||
|
|
|
@ -406,7 +406,7 @@
|
|||
<target><![CDATA[Diese Facetten anzeigen]]></target>
|
||||
</trans-unit>
|
||||
<trans-unit id="plugins.search.flexform.facets.collections" approved="yes">
|
||||
<source><![CDATA[Use only this collections as facet]]></source>
|
||||
<source><![CDATA[Use only these collections as facet]]></source>
|
||||
<target><![CDATA[Folgende Kollektionen als Facetten anzeigen]]></target>
|
||||
</trans-unit>
|
||||
<trans-unit id="plugins.search.flexform.facets.limit" approved="yes">
|
||||
|
|
|
@ -35,9 +35,6 @@
|
|||
<trans-unit id="search.resetFacet">
|
||||
<source><![CDATA[Reset selection (%s)]]></source>
|
||||
</trans-unit>
|
||||
<trans-unit id="AddToBasket">
|
||||
<source><![CDATA[Add to basket]]></source>
|
||||
</trans-unit>
|
||||
<trans-unit id="backXPages">
|
||||
<source><![CDATA[Back %s Pages]]></source>
|
||||
</trans-unit>
|
||||
|
|
|
@ -81,7 +81,7 @@
|
|||
<source><![CDATA[Search Plugin for Kitodo.Presentation]]></source>
|
||||
</trans-unit>
|
||||
<trans-unit id="plugins.search.flexform.facets.collections">
|
||||
<source><![CDATA[Use only this collections as facet]]></source>
|
||||
<source><![CDATA[Use only these collections as facet]]></source>
|
||||
</trans-unit>
|
||||
<trans-unit id="plugins.search.flexform.fulltext">
|
||||
<source><![CDATA[Enable full text search?]]></source>
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
action="add"
|
||||
controller="Basket"
|
||||
additionalParams="{'tx_dlf[id]':result.uid, 'tx_dlf[startpage]':result.page, 'tx_dlf[addToBasket]':'list'}">
|
||||
<f:translate key="AddToBasket"/>
|
||||
<f:translate key="basket.addBasket"/>
|
||||
</f:link.action>
|
||||
</div>
|
||||
</f:if>
|
||||
|
|
|
@ -18,11 +18,13 @@
|
|||
<f:variable name="allDocuments" value="{documents->f:count()}" />
|
||||
<f:variable name="numDocuments" value="{pageOffset + settings.list.paginate.itemsPerPage}" />
|
||||
|
||||
<p class="tx-dlf-sortinfo">
|
||||
<f:translate
|
||||
key="listview.count"
|
||||
arguments="{0:'{pageOffset + 1}', 1:'{f:if(condition: \'{numDocuments} > {allDocuments}\', then: \'{allDocuments}\', else: \'{numDocuments}\')}', 2:'{allDocuments}'}" />
|
||||
</p>
|
||||
<f:if condition="{allDocuments} > 0">
|
||||
<p class="tx-dlf-sortinfo">
|
||||
<f:translate
|
||||
key="listview.count"
|
||||
arguments="{0:'{pageOffset + 1}', 1:'{f:if(condition: \'{numDocuments} > {allDocuments}\', then: \'{allDocuments}\', else: \'{numDocuments}\')}', 2:'{allDocuments}'}" />
|
||||
</p>
|
||||
</f:if>
|
||||
|
||||
<f:form section="showResults" action="{action}" controller="{Controller}" name="searchParameter" method="post" class="tx-dlf-search-form">
|
||||
<div>
|
||||
|
|
|
@ -59,7 +59,7 @@
|
|||
controller="Basket"
|
||||
additionalParams="{'tx_dlf[addToBasket]':'toc', 'tx_dlf[logId]':child.basketButton.logId, 'tx_dlf[startpage]':child.basketButton.startpage, 'tx_dlf_basket[action]':'add', 'tx_dlf_basket[controller]':'Basket'}"
|
||||
addQueryString="1">
|
||||
<f:translate key="AddToBasket" />
|
||||
<f:translate key="basket.addBasket" />
|
||||
</f:link.action>
|
||||
</span>
|
||||
</f:if>
|
||||
|
|
|
@ -208,7 +208,7 @@ function DlfAnnotationControl(map, image, annotationContainers) {
|
|||
.text(this.dic['annotations-on'])
|
||||
.attr('title', this.dic['annotations-on']);
|
||||
|
||||
// if annotation is activated via cookie than run activation methode
|
||||
// if annotation is activated via cookie then run activation method
|
||||
if (dlfUtils.getCookie("tx-dlf-pageview-annotation-select") === 'enabled') {
|
||||
// activate the annotation behavior
|
||||
this.activate(anchorEl);
|
||||
|
|
|
@ -322,7 +322,7 @@ dlfViewerFullTextControl.prototype.addActiveBehaviourForSwitchOff = function() {
|
|||
.text(this.dic['fulltext-on'])
|
||||
.attr('title', this.dic['fulltext-on']);
|
||||
|
||||
// if fulltext is activated via cookie than run activation methode
|
||||
// if fulltext is activated via cookie then run activation method
|
||||
if (dlfUtils.getCookie("tx-dlf-pageview-fulltext-select") === 'enabled') {
|
||||
// activate the fulltext behavior
|
||||
this.activate();
|
||||
|
@ -455,7 +455,7 @@ dlfViewerFullTextControl.prototype.activate = function() {
|
|||
};
|
||||
|
||||
/**
|
||||
* Activate Fulltext Features
|
||||
* Deactivate Fulltext Features
|
||||
*/
|
||||
dlfViewerFullTextControl.prototype.deactivate = function() {
|
||||
|
||||
|
|
Loading…
Reference in New Issue