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.

Sign up for GitHub

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

[FEATURE] 3D viewer selection #326

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

[FEATURE] 3D viewer selection #326

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7442005
Add viewer selection
markusweigelt Dec 3, 2024
06354b3
Remove unnecessary new line
markusweigelt Dec 3, 2024
37dddfd
Zindex of provider logo
markusweigelt Dec 3, 2024
57f7505
Merge branch 'master' into 3dviewer-selection
beatrycze-volk Jan 22, 2025
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
9 changes: 9 additions & 0 deletions Configuration/TypoScript/Plugins/kitodo.typoscript
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,7 @@ lib.kitodo.navigation.viewfunction {
# imagedownloadtool
# imagemanipulationtool
# modeldownloadtool
# viewerselectiontool
# pdfdownloadtool
# searchindocumenttool

Expand All @@ -173,6 +174,14 @@ plugin.tx_dlf_modeldownloadtool {
}
}

plugin.tx_dlf_viewerselectiontool < plugin.tx_dlf_toolbox
plugin.tx_dlf_viewerselectiontool {
settings {
fileGrpsModelDownload = DEFAULT
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please remove this config from typoscript.

tools = viewerselectiontool
}
}

plugin.tx_dlf_fulltexttool < plugin.tx_dlf_toolbox
plugin.tx_dlf_fulltexttool {
settings {
Expand Down
10 changes: 10 additions & 0 deletions Resources/Private/Less/components/controls.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,6 +327,7 @@
}

/* ==============[ view functions for zoom, rotate and other view related functions ]===== */
.viewer-selection,
.view-functions {
ul {
position: relative;
Expand All @@ -344,6 +345,7 @@
&.rotate {
display: none;
}
&.viewers,
&.pages {
position: relative;
top: auto;
Expand Down Expand Up @@ -489,6 +491,14 @@
}
}

/* ==============[ the viewer selection tools ]========================================= */
.viewer-selection {
> ul {
top: 0;
right: -254px;
}
}

/* ==============[ the image manipulation tools ]========================================= */
.image-manipulation {
position: absolute;
Expand Down
2 changes: 1 addition & 1 deletion Resources/Private/Less/structure.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ a {
left: 0;
right: 0;
text-align: left;
z-index: auto;
z-index: 1;
background: #fff;
display: flex;
align-items: center;
Expand Down
7 changes: 7 additions & 0 deletions Resources/Private/Partials/Submenu.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,13 @@
<f:cObject typoscriptObjectPath="plugin.tx_dlf_modeldownloadtool"/>
</ul>
</li>
<li class="viewer-selection" >
<ul>
<li class="viewers">
<f:cObject typoscriptObjectPath="plugin.tx_dlf_viewerselectiontool"/>
</li>
</ul>
</li>
</f:then>
<f:else>
<li class="submenu downloads">
Expand Down
2 changes: 1 addition & 1 deletion Resources/Public/Css/allStyles.css
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Resources/Public/Css/webStyles.css
View file
Open in desktop

Large diffs are not rendered by default.

Loading