Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
28 changes: 28 additions & 0 deletions Classes/Controller/ToolboxController.php
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,11 @@ private function renderTools(): void
'tx_dlf_imagemanipulationtool', 'imagemanipulationtool' => $this->renderToolByName('renderImageManipulationTool'),
'tx_dlf_modeldownloadtool', 'modeldownloadtool' => $this->renderToolByName('renderModelDownloadTool'),
'tx_dlf_pdfdownloadtool', 'pdfdownloadtool' => $this->renderToolByName('renderPdfDownloadTool'),
'tx_dlf_rotationtool', 'rotationtool' => $this->renderToolByName('renderRotationTool'),
'tx_dlf_scoretool', 'scoretool' => $this->renderToolByName('renderScoreTool'),
'tx_dlf_searchindocumenttool', 'searchindocumenttool' => $this->renderToolByName('renderSearchInDocumentTool'),
'tx_dlf_viewerselectiontool', 'viewerselectiontool' => $this->renderToolByName('renderViewerSelectionTool'),
'tx_dlf_zoomtool', 'zoomtool' => $this->renderToolByName('renderZoomTool'),
default => $this->logger->warning('Incorrect tool configuration: "' . $this->settings['tools'] . '". Tool "' . $tool . '" does not exist.')
};
}
Expand Down Expand Up @@ -708,4 +710,30 @@ private function isFullTextEmpty(): bool
}
return true;
}

/**
* Renders the rotation tool (used in template)
* @SuppressWarnings(PHPMD.UnusedPrivateMethod)
*
* @access private
*
* @return void
*/
private function renderRotationTool(): void
{
// Empty function, no view arguments needed
}

/**
* Renders the zoom tool (used in template)
* @SuppressWarnings(PHPMD.UnusedPrivateMethod)
*
* @access private
*
* @return void
*/
private function renderZoomTool(): void
{
// Empty function, no view arguments needed
}
}
6 changes: 3 additions & 3 deletions Documentation/Plugins/Index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -704,7 +704,7 @@ TypoScript Configuration
:Default:
By default all features are activated. The selection is stored as comma separated list.

doublePage,pageFirst,pageBack,pageStepBack,pageSelect,pageForward,pageStepForward,pageLast,listView,zoom,rotation,measureForward,measureBack
doublePage,pageFirst,pageBack,pageStepBack,pageSelect,pageForward,pageStepForward,pageLast,listView,measureForward,measureBack
:Values:
* doublePage
* listView
Expand All @@ -719,8 +719,6 @@ TypoScript Configuration
* pageStepForward
* pagesBackward
* pagesForward
* rotation
* zoom

- :Property:
pageStep
Expand Down Expand Up @@ -1242,8 +1240,10 @@ TypoScript Configuration
* modeldownloadtool
* multiviewaddsourcetool
* pdfdownloadtool
* rotationtool
* searchindocumenttool
* scoretool
* zooomtool

- :Property:
solrCoreUid
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
data-namespace-typo3-fluid="true">

<div class="tx-dlf-navigation-rotate-left">
<li class="tx-dlf-navigation-rotate-left">
<a href="#" title="{f:translate(key: 'rotateLeft')}" onclick="tx_dlf_viewer.map.rotateLeft();"><f:translate key="rotateLeft"/></a>
</div>
<div class="tx-dlf-navigation-rotate-right">
</li>
<li class="tx-dlf-navigation-rotate-right">
<a href="#" title="{f:translate(key: 'rotateRight')}" onclick="tx_dlf_viewer.map.rotateRight();"><f:translate key="rotateRight"/></a>
</div>
<div class="tx-dlf-navigation-rotate-reset">
</li>
<li class="tx-dlf-navigation-rotate-reset">
<a href="#" title="{f:translate(key: 'rotateReset')}" onclick="tx_dlf_viewer.map.resetRotation();"><f:translate key="rotateReset"/></a>
</div>
</li>

</html>
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
data-namespace-typo3-fluid="true">

<div class="tx-dlf-navigation-zoom-in">
<li class="tx-dlf-navigation-zoom-in">
<a href="#" title="{f:translate(key: 'zoomIn')}" onclick="tx_dlf_viewer.map.zoomIn();"><f:translate key="zoomIn"/></a>
</div>
<div class="tx-dlf-navigation-zoom-out">
</li>
<li class="tx-dlf-navigation-zoom-out">
<a href="#" title="{f:translate(key: 'zoomOut')}" onclick="tx_dlf_viewer.map.zoomOut();"><f:translate key="zoomOut"/></a>
</div>
<div class="tx-dlf-navigation-fullscreen">
</li>
<li class="tx-dlf-navigation-fullscreen">
<a href="#" title="{f:translate(key: 'zoomFullscreen')}"><f:translate key="zoomFullscreen"/></a>
</div>
</li>

</html>
8 changes: 0 additions & 8 deletions Resources/Private/Templates/Navigation/Main.html
Original file line number Diff line number Diff line change
Expand Up @@ -73,14 +73,6 @@
<f:render partial="Navigation/ListView" arguments="{_all}" />
</f:section>

<f:section name="render.zoom">
<f:render partial="Navigation/Zoom" arguments="{_all}" />
</f:section>

<f:section name="render.rotation">
<f:render partial="Navigation/Rotation" arguments="{_all}" />
</f:section>

<f:section name="render.measureBack">
<f:render partial="Navigation/MeasureBack" arguments="{_all}" />
</f:section>
Expand Down
36 changes: 22 additions & 14 deletions Resources/Private/Templates/Toolbox/Main.html
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,6 @@
<f:render partial="Toolbox/AnnotationTool" arguments="{_all}" />
</f:if>

<f:if condition="{renderImageManipulationTool}">
<f:render partial="Toolbox/ImageManipulationTool" arguments="{_all}" />
</f:if>

<f:if condition="{renderAudioVideoTool}">
<f:render partial="Toolbox/AudioVideoTool" arguments="{_all}" />
</f:if>
Expand All @@ -33,33 +29,45 @@
<f:render partial="Toolbox/ImageDownloadTool" arguments="{_all}" />
</f:if>

<f:if condition="{renderModelDownloadTool} && {modelUrl}">
<f:render partial="Toolbox/ModelDownloadTool" arguments="{_all}" />
<f:if condition="{renderImageManipulationTool}">
<f:render partial="Toolbox/ImageManipulationTool" arguments="{_all}" />
</f:if>

<f:if condition="{renderViewerSelectionTool} && {viewers}">
<f:render partial="Toolbox/ViewerSelectionTool" arguments="{_all}" />
<f:if condition="{renderFulltextDownloadTool}">
<f:render partial="Toolbox/FulltextDownloadTool" arguments="{_all}" />
</f:if>

<f:if condition="{renderFulltextTool}">
<f:render partial="Toolbox/FulltextTool" arguments="{_all}" />
</f:if>

<f:if condition="{renderFulltextDownloadTool}">
<f:render partial="Toolbox/FulltextDownloadTool" arguments="{_all}" />
</f:if>

<f:if condition="{renderScoreTool} && {score}">
<f:render partial="Toolbox/ScoreTool" arguments="{_all}" />
<f:if condition="{renderModelDownloadTool} && {modelUrl}">
<f:render partial="Toolbox/ModelDownloadTool" arguments="{_all}" />
</f:if>

<f:if condition="{renderPdfDownloadTool}">
<f:render partial="Toolbox/PdfDownloadTool" arguments="{_all}" />
</f:if>

<f:if condition="{renderRotationTool}">
<f:render partial="Toolbox/RotationTool" arguments="{_all}" />
</f:if>

<f:if condition="{renderScoreTool} && {score}">
<f:render partial="Toolbox/ScoreTool" arguments="{_all}" />
</f:if>

<f:if condition="{renderSearchInDocumentTool} && {searchInDocument}">
<f:render partial="Toolbox/SearchInDocumentTool" arguments="{_all}" />
</f:if>

<f:if condition="{renderViewerSelectionTool} && {viewers}">
<f:render partial="Toolbox/ViewerSelectionTool" arguments="{_all}" />
</f:if>

<f:if condition="{renderZoomTool}">
<f:render partial="Toolbox/ZoomTool" arguments="{_all}" />
</f:if>
</ul>

</html>
Loading