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

Hotfix vom 16.10. #1

Merged
merged 6 commits into from
Feb 15, 2024
Merged

Hotfix vom 16.10. #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0bae391
Merge pull request #231 from effective-webwork/Full-text-features-main
sebastian-meyer Sep 14, 2023
1b7e1b0
Hotfixes 16.10.
sebastian-meyer Oct 16, 2023
70eaab7
Merge pull request #1 from sebastian-meyer/Full-text-features-main
sebastian-meyer Oct 16, 2023
bcd9fa7
Merge pull request #9 from effective-webwork/Full-text-features-main
sebastian-meyer Nov 14, 2023
0ee231a
Merge branch 'project-musical-sources' into Full-text-features-main
sebastian-meyer Feb 14, 2024
1ee05a6
Merge pull request #19 from opencultureconsulting/Full-text-features-…
sebastian-meyer Feb 14, 2024
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
2 changes: 1 addition & 1 deletion Classes/Controller/UriController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public function mainAction()
{
// Load current document.

$this->loadDocument($this->requestData);
$this->loadDocument();

if ($this->document === null) {
return;
Expand Down
2 changes: 1 addition & 1 deletion Resources/Private/Layouts/KitodoPage.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

<f:render section="PageView" partial="PageView" arguments="{_all}" />

<f:render section="AnnotationBar" partial="AnnotationsBar" arguments="{_all}" />
<f:comment><f:render section="AnnotationBar" partial="AnnotationsBar" arguments="{_all}" /></f:comment>
</f:else>
</f:if>
</div>
Expand Down
17 changes: 6 additions & 11 deletions Resources/Private/Partials/PageView.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,19 +42,14 @@ <h2>
<f:cObject typoscriptObjectPath="plugin.tx_dlf_pageview" />
<f:cObject typoscriptObjectPath="plugin.tx_dlf_audioplayer" />
<div class="fulltext-container"><div id="tx-dlf-fulltextselection"></div></div>
<f:comment>
<div class="score-container">
<div id="tx-dlf-score"></div>
</div>
<div id="player"></div>
</f:comment>
</f:else>
</f:if>

<f:cObject typoscriptObjectPath="plugin.tx_dlf_audioplayer" />
<div class="fulltext-container">
<div id="tx-dlf-fulltextselection"></div>
</div>
<f:comment>
<div class="score-container">
<div id="tx-dlf-score"></div>
</div>
<div id="player"></div>
</f:comment>
</f:else>
</f:if>
</f:else>
Expand Down
3 changes: 1 addition & 2 deletions Resources/Private/Plugins/Kitodo/Templates/PageView/Main.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,8 +130,7 @@
</div>
</f:then>
<f:else>
<div id="tx-dfgviewer-map" class="tx-dlf-map">
</div>
<div id="tx-dfgviewer-map" class="tx-dlf-map"></div>
<div id="svg_panel" >
<div id="player" style="z-index: 0; position: absolute;"></div>
<div id="svg_output" style="overflow:hidden;"></div>
Expand Down
2 changes: 1 addition & 1 deletion Resources/Public/Css/annotationStyles.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
}

.document-view {
right: 25%;
/* right: 25%; */
}

.annotation-list-item details.hover {
Expand Down