diff --git a/Configuration/TypoScript/Page/header.typoscript b/Configuration/TypoScript/Page/header.typoscript index 6d86fa256..b38c29fd7 100644 --- a/Configuration/TypoScript/Page/header.typoscript +++ b/Configuration/TypoScript/Page/header.typoscript @@ -7,8 +7,6 @@ page { includeCSS { style = EXT:dfgviewer/Resources/Public/Css/webStyles.css highlight = EXT:dfgviewer/Resources/Public/JavaScript/Highlight/styles/magula.css - 3DViewer = EXT:dfgviewer/Resources/Public/Css/3DViewer/main.css - 3DViewerSpinner = EXT:dfgviewer/Resources/Public/Css/3DViewer/spinner.css } includeJSFooterlibs { jQuery = EXT:dfgviewer/Resources/Public/JavaScript/jQuery/jquery-3.6.0.min.js diff --git a/Configuration/TypoScript/Plugins/kitodo.typoscript b/Configuration/TypoScript/Plugins/kitodo.typoscript index 9d14ff1af..9959c34a9 100644 --- a/Configuration/TypoScript/Plugins/kitodo.typoscript +++ b/Configuration/TypoScript/Plugins/kitodo.typoscript @@ -67,15 +67,10 @@ plugin.tx_dlf_pageview { } # -------------------------------------------------------------------------------------------------------------------- -# 3D objects view +# embedded 3D viewer # -------------------------------------------------------------------------------------------------------------------- -plugin.tx_dlf_view3d < tt_content.list.20.dlf_view3d -plugin.tx_dlf_view3d { - pages = {$config.storagePid} - excludeOther = 0 - features = - elementId = tx-dfgviewer-3d-view - fileGrpImages = THUMBS,DEFAULT +plugin.tx_dlf_embedded3dviewer < tt_content.list.20.dlf_embedded3dviewer +plugin.tx_dlf_embedded3dviewer { } # -------------------------------------------------------------------------------------------------------------------- @@ -159,6 +154,7 @@ lib.kitodo.navigation.viewfunction { # fulltextdownloadtool # imagedownloadtool # imagemanipulationtool +# modeldownloadtool # pdfdownloadtool # searchindocumenttool @@ -169,6 +165,14 @@ plugin.tx_dlf_toolbox { } } +plugin.tx_dlf_modeldownloadtool < plugin.tx_dlf_toolbox +plugin.tx_dlf_modeldownloadtool { + settings { + fileGrpsModelDownload = DEFAULT + tools = modeldownloadtool + } +} + plugin.tx_dlf_fulltexttool < plugin.tx_dlf_toolbox plugin.tx_dlf_fulltexttool { settings { @@ -204,9 +208,18 @@ plugin.tx_dlf_audioplayer { } # -------------------------------------------------------------------------------------------------------------------- -# newspaper navigation +# 3d object # -------------------------------------------------------------------------------------------------------------------- +[getDocumentType({$config.storagePid}) == "object"] + page.10.variables { + is3dObject = TEXT + is3dObject.value = 1 + } +[END] +# -------------------------------------------------------------------------------------------------------------------- +# newspaper navigation +# -------------------------------------------------------------------------------------------------------------------- [getDocumentType({$config.storagePid}) == "ephemera" or getDocumentType({$config.storagePid}) == "newspaper"] page.10.variables { isNewspaper = TEXT diff --git a/Resources/Private/Less/components/controls.less b/Resources/Private/Less/components/controls.less index 4d9ce562d..0736a26e4 100644 --- a/Resources/Private/Less/components/controls.less +++ b/Resources/Private/Less/components/controls.less @@ -140,6 +140,7 @@ &.persistence-page:before { background-position: -320px -80px; } + &.tx-dlf-tools-modeldownload:before, &.tx-dlf-tools-imagedownload:before { background-position: -320px -40px; } @@ -153,6 +154,9 @@ left: -40px; } } + &.tx-dlf-tools-modeldownload { + opacity: 1; + } } span { opacity: 0.5; @@ -974,4 +978,4 @@ body.dfgviewer.calendar { position: relative; top: -80px; } -} \ No newline at end of file +} diff --git a/Resources/Private/Partials/ControlBar.html b/Resources/Private/Partials/ControlBar.html index b08cb06bf..f720bb549 100644 --- a/Resources/Private/Partials/ControlBar.html +++ b/Resources/Private/Partials/ControlBar.html @@ -19,31 +19,17 @@