Support for musical sources (and prototype annotations) #230

haogatyp · 2023-07-25T13:11:10Z

No description provided.

Resources/Private/Less/modules/score.less

sebastian-meyer · 2023-08-08T08:31:47Z

@haogatyp Please resolve the merge conflicts.

…-main Full text features main

Hotfixes 16.10.

Update from EWW

…res-main 13.02.

Hotfix vom 16.10.

# Conflicts: # Build/package-lock.json # Classes/Controller/UriController.php # Resources/Private/JavaScript/dfgviewerScripts.js # Resources/Private/Less/all.less # Resources/Private/Less/components/audioplayer.less # Resources/Private/Less/components/controls.less # Resources/Private/Less/modules/home.less # Resources/Private/Partials/ControlBar.html # Resources/Private/Partials/PageView.html # Resources/Public/Css/allStyles.css # Resources/Public/Css/webStyles.css # Resources/Public/JavaScript/allScripts.js # Resources/Public/JavaScript/webScripts.js

Resources/Private/JavaScript/dfgviewerScripts.js

+
+    // toggle for full metadata display in sidebar
+    if ($('.control-bar .metadata-basic dl.tx-dlf-metadata-titledata').length > 1) {
+        metadataToggleLabelMore = ($('html[lang^="de"]')[0]) ? 'mehr Metadaten anzeigen' : 'more Metadata';


Resources/Private/JavaScript/dfgviewerScripts.js

+    // toggle for full metadata display in sidebar
+    if ($('.control-bar .metadata-basic dl.tx-dlf-metadata-titledata').length > 1) {
+        metadataToggleLabelMore = ($('html[lang^="de"]')[0]) ? 'mehr Metadaten anzeigen' : 'more Metadata';
+        metadataToggleLabelLess = ($('html[lang^="de"]')[0]) ? 'weniger Metadaten anzeigen' : 'less Metadata';


Resources/Private/JavaScript/dfgviewerScripts.js

Resources/Private/Less/all.less

Resources/Private/Plugins/Kitodo/Templates/PageView/Main.html

Co-authored-by: Sebastian Meyer <sebastian.meyer@opencultureconsulting.com>

sebastian-meyer

Last fixes for the remaining static code analyzer issues. Also, please have a look at the Codacy issues: https://app.codacy.com/gh/slub/dfg-viewer/pull-requests/230/issues

Resources/Private/JavaScript/dfgviewerScripts.js

…k/dfg-viewer into Full-text-features-main

Co-authored-by: Sebastian Meyer <sebastian.meyer@opencultureconsulting.com>

sebastian-meyer

Good work! This is ready for testing, now!

The only remaining issue is with the new Grunt version. Could you please check that?
(see https://github.com/slub/dfg-viewer/actions/runs/9877302151/job/27494458932?pr=230)

chrizzor · 2024-07-17T07:45:33Z

It looks like Thomas Jung @gnuj has set the version of grunt in the package.json to ^1.6. The installed version therefore does not match the specification in the package-lock.json file. Perhaps Thomas Jung still needs to commit the lock file? I'm not sure.

sebastian-meyer · 2024-07-20T09:48:42Z

@beatrycze-volk From my point of view, this is ready for merging. The corresponding PR kitodo/kitodo-presentation#1281 has been merged.

This can be tested at https://test.dfg-viewer.de

The remaining Grunt issue should be easily fixed by running npm update once. Unfortunately I can't do that because I don't have access to the source branch.

gnuj · 2024-07-22T10:49:12Z

The remaining Grunt issue should be easily fixed by running npm update once. Unfortunately I can't do that because I don't have access to the source branch.

Thats completely correct. This will probably be significantly less work than if I start a complete new branch including a merge request. If this is important for organisational reasons just hit me up.

sebastian-meyer · 2024-07-22T11:00:48Z

Since we all can't access the source branch (and @chrizzor isn't available for the next two months), I propose merging this, then immediately run npm update and push the changes again. Is that OK, @beatrycze-volk?

beatrycze-volk · 2024-07-22T12:10:30Z

Hi @sebastian-meyer, I currently have no access to my computer so please feel free to make it :)

sebastian-meyer · 2024-07-22T13:04:39Z

OK, you are the release manager, I'll do as you say! ;o)

stweil · 2024-07-22T17:14:23Z

I'm afraid that Resources/Public/Css/allStyles.css.map should not have been added. Pull request #294 removes it again.

stweil · 2024-07-22T17:53:12Z

For future contributions it would be good to set a valid author name.

beatrycze-volk

@sebastian-meyer Unfortunately this PR has broken few functionalities inside the DFG Viewer. eg. the calendar view for the newspapers is gone, the fulltext window is gone. I have to revert those changes.

I have left few review comments, but they contain only the problems discovered on the first look. After they are fixed and the removed functionalities are restored, I will make more through review.

beatrycze-volk · 2024-08-08T10:36:35Z

Configuration/TypoScript/Config/config.typoscript

@@ -8,7 +8,7 @@ config {
  removeDefaultJS = 1

  # concatenate all Javascript files by default
-  concatenateJs = 1
+  concatenateJs = 0


This should not be changed.

beatrycze-volk · 2024-08-08T10:37:07Z

Configuration/TypoScript/Page/header.typoscript

@@ -35,6 +36,11 @@ page {
  includeJSFooterlibs {
    dfgviewer = EXT:dfgviewer/Resources/Public/JavaScript/allScripts.js
  }
+  footerData {
+    # Add OpenLayers styling for the scores (This is 'dirty' integrated via footerData to ensure that it overrides the styles brought by DLF and other extensions)


I think that's not the right solution.

beatrycze-volk · 2024-08-08T10:39:08Z

Resources/Private/Language/de.locallang.xlf

@@ -57,6 +57,34 @@
 				<source><![CDATA[Thumbnail Preview]]></source>
 				<target><![CDATA[Vorschaubilder]]></target>
 			</trans-unit>
+            <trans-unit id="multiview.add_document.description">


camelCase should be used in he names to keep consistency with the rest of the labels.

beatrycze-volk · 2024-08-08T10:40:50Z

Resources/Private/Less/modules/fulltext.less

@@ -13,6 +13,14 @@
    bottom: 0;
    background: #fff;
    text-align: left;
+
+    display: none;


Fulltext can't be hidden. It breaks one of the main functionalities of DFG Viewer!

beatrycze-volk · 2024-08-08T10:45:56Z

Resources/Private/Plugins/Dfgviewer/Sru.tmpl

@@ -0,0 +1,21 @@
+<!-- ###TEMPLATE### begin -->


I'm not even sure what has happend here...

beatrycze-volk · 2024-08-08T10:51:46Z

Resources/Private/Plugins/Kitodo/Templates/PageView/Main.html

+                            <div class="score-tool">
+                                <f:if condition="{scoreAvailable.{iterator.index}}">
+                                    <f:then>
+                                        <a class="select switchoff" id="tx-dlf-tools-score-{iterator.index}" title="" data-dic="fulltext:{f:translate(key: 'tools.score')}


Is this fulltext or score tool?

beatrycze-volk · 2024-08-08T10:52:46Z

Resources/Private/Plugins/Kitodo/Templates/PageView/Main.html

+                                    </f:else>
+                                </f:if>
+                                <f:comment>
+                                    <f:cObject typoscriptObjectPath="plugin.tx_dlf_scoretool" />


There shouldn't be commented code introduced.

beatrycze-volk · 2024-08-08T11:00:29Z

Resources/Private/Plugins/Kitodo/Templates/PageView/Main.html

+            <div id="svg_output" style="overflow:hidden;"></div>
+        </div>
+
+        <f:comment>


As previously mentioned no commented code.

beatrycze-volk · 2024-08-08T11:00:51Z

Resources/Private/Templates/Kitodo.html

@@ -3,7 +3,7 @@
 <div xmlns="http://www.w3.org/1999/xhtml" lang="en" xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers">

 	<f:section name="Content">
-		<f:format.raw>{content}</f:format.raw>
+		<f:format.raw>{ccontent}</f:format.raw>


Why the name is changed?

beatrycze-volk · 2024-08-08T11:01:56Z

Resources/Public/JavaScript/OLStyles.js

+/**
+ * @return {ol.style.Style}
+ */
+dlfViewerOLStyles.hoverStyle = function () {


Are open layer not included in kitodo presentation? Why additionally here?

This reverts commit 7261790.

sebastian-meyer · 2024-08-12T09:30:05Z

@chrizzor has to take a look at this and fix these issues, since it's his work. But he won't be back before end of september.

sebastian-meyer mentioned this pull request Jul 25, 2023

Full text features measure navigation #228

Closed

stweil suggested changes Jul 25, 2023

View reviewed changes

Resources/Private/Less/modules/score.less Outdated Show resolved Hide resolved

sebastian-meyer assigned haogatyp Aug 8, 2023

Matthias Richter and others added 8 commits August 21, 2023 09:29

Verovio Integration

0bbb959

Add full texts features

26a1143

Styles for score rendering

dd52acc

Add features for measures to pagecontrol.

375cd12

Use annotation plugin.

70c33b2

Add multiview parameter and hide information to have more space

89d0cdb

Add gridstack html and page/measure navigation to pageview template

75fd343

CSS update: score, svg hover and drag styling for gridstack item

ef9146a

haogatyp force-pushed the Full-text-features-main branch from 6e28f2d to ef9146a Compare August 21, 2023 07:40

gnuj mentioned this pull request Aug 23, 2023

Fix license comments in LESS file headers #233

Merged

Merge pull request slub#231 from effective-webwork/Full-text-features…

0bae391

…-main Full text features main

sebastian-meyer marked this pull request as draft September 27, 2023 09:03

sebastian-meyer and others added 2 commits October 16, 2023 12:30

Hotfixes 16.10.

1b7e1b0

Merge pull request #1 from sebastian-meyer/Full-text-features-main

70eaab7

Hotfixes 16.10.

haogatyp marked this pull request as ready for review October 17, 2023 09:00

beatrycze-volk added the ✔️ feature A new feature or enhancement. label Oct 18, 2023

chrizzor and others added 10 commits October 24, 2023 16:20

Change position of gridstack item navigation

8233bd1

Show gridstack if more than one document is given

a4cf372

Merge pull request slub#9 from effective-webwork/Full-text-features-main

bcd9fa7

Update from EWW

Add controlbar in multiview

800917d

Fix multiview global navigation

91fb54b

remove empty gridstack item

dfc63c5

Add scoretool for each gridstack item

0cd7f71

Merge branch 'project-musical-sources' into Full-text-features-main

0ee231a

Merge pull request slub#19 from opencultureconsulting/Full-text-featu…

1ee05a6

…res-main 13.02.

Merge pull request #1 from sebastian-meyer/project-musical-sources

3122d48

Hotfix vom 16.10.

chrizzor added 3 commits June 11, 2024 17:01

Show spinner on page or measure browsing

18c2c29

Merge branch 'master' into Full-text-features-main

8696461

github-advanced-security bot found potential problems Jul 8, 2024

View reviewed changes

sebastian-meyer requested changes Jul 8, 2024

View reviewed changes

Resources/Private/JavaScript/dfgviewerScripts.js Outdated Show resolved Hide resolved

Resources/Private/Less/all.less Outdated Show resolved Hide resolved

Resources/Private/Plugins/Kitodo/Templates/PageView/Main.html Outdated Show resolved Hide resolved

sebastian-meyer changed the title ~~Full text features main~~ Support for musical sources (and prototype annotations) Jul 8, 2024

Apply suggestions from code review

d6867aa

Co-authored-by: Sebastian Meyer <sebastian.meyer@opencultureconsulting.com>

sebastian-meyer requested changes Jul 10, 2024

View reviewed changes

Resources/Private/JavaScript/dfgviewerScripts.js Outdated Show resolved Hide resolved

Resources/Private/JavaScript/dfgviewerScripts.js Outdated Show resolved Hide resolved

chrizzor and others added 3 commits July 10, 2024 17:40

Codacy fix

1575a47

Merge branch 'Full-text-features-main' of github.com:effective-webwor…

8ad49d1

…k/dfg-viewer into Full-text-features-main

Apply suggestions from code review

96656ff

Co-authored-by: Sebastian Meyer <sebastian.meyer@opencultureconsulting.com>

sebastian-meyer approved these changes Jul 16, 2024

View reviewed changes

sebastian-meyer requested a review from beatrycze-volk July 20, 2024 09:42

sebastian-meyer assigned chrizzor Jul 20, 2024

sebastian-meyer mentioned this pull request Jul 20, 2024

Support for musical sources slub/slub_digitalcollections#53

Merged

sebastian-meyer merged commit 7261790 into slub:master Jul 22, 2024
5 of 6 checks passed

sebastian-meyer mentioned this pull request Jul 22, 2024

Update generated CSS and JS files #291

Merged

beatrycze-volk reviewed Aug 8, 2024

View reviewed changes

beatrycze-volk added a commit that referenced this pull request Aug 8, 2024

Revert "Support for musical sources (and prototype annotations) (#230)"

947342d

This reverts commit 7261790.

This was referenced Aug 8, 2024

Revert "Support for musical sources (and prototype annotations)" #303

Merged

Revert "Update GitHub actions which still used deprecated Node.js" #300

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Support for musical sources (and prototype annotations) #230

Support for musical sources (and prototype annotations) #230

haogatyp commented Jul 25, 2023

sebastian-meyer commented Aug 8, 2023

sebastian-meyer left a comment •

edited

Loading

sebastian-meyer left a comment

chrizzor commented Jul 17, 2024

sebastian-meyer commented Jul 20, 2024

gnuj commented Jul 22, 2024

sebastian-meyer commented Jul 22, 2024

beatrycze-volk commented Jul 22, 2024

sebastian-meyer commented Jul 22, 2024

stweil commented Jul 22, 2024

stweil commented Jul 22, 2024

beatrycze-volk left a comment

beatrycze-volk Aug 8, 2024

beatrycze-volk Aug 8, 2024

beatrycze-volk Aug 8, 2024

beatrycze-volk Aug 8, 2024

beatrycze-volk Aug 8, 2024

beatrycze-volk Aug 8, 2024

beatrycze-volk Aug 8, 2024

beatrycze-volk Aug 8, 2024

beatrycze-volk Aug 8, 2024

beatrycze-volk Aug 8, 2024

sebastian-meyer commented Aug 12, 2024

Support for musical sources (and prototype annotations) #230

Support for musical sources (and prototype annotations) #230

Conversation

haogatyp commented Jul 25, 2023

sebastian-meyer commented Aug 8, 2023

sebastian-meyer left a comment • edited Loading

Choose a reason for hiding this comment

sebastian-meyer left a comment

Choose a reason for hiding this comment

chrizzor commented Jul 17, 2024

sebastian-meyer commented Jul 20, 2024

gnuj commented Jul 22, 2024

sebastian-meyer commented Jul 22, 2024

beatrycze-volk commented Jul 22, 2024

sebastian-meyer commented Jul 22, 2024

stweil commented Jul 22, 2024

stweil commented Jul 22, 2024

beatrycze-volk left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sebastian-meyer commented Aug 12, 2024

sebastian-meyer left a comment •

edited

Loading