Skip to content

Commit 4cdf8ed

Browse files
author
Dominick Leppich
committed
Merge pull request 'Release v25.05' (#24) from release_25.05 into master
2 parents 46d7b96 + 4f8a28d commit 4cdf8ed

File tree

18 files changed

+2044
-1920
lines changed

18 files changed

+2044
-1920
lines changed

‎module-base/pom.xml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
1+
<?xml version='1.0' encoding='UTF-8'?>
12
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
23
<modelVersion>4.0.0</modelVersion>
34
<parent>
45
<groupId>io.goobi.workflow.plugin</groupId>
56
<artifactId>plugin-workflow-entity-editor</artifactId>
6-
<version>25.04</version>
7+
<version>25.05</version>
78
</parent>
89
<artifactId>plugin-workflow-entity-editor-base</artifactId>
910
<packaging>jar</packaging>
1011
<dependencies>
1112
<dependency>
1213
<groupId>io.goobi.workflow.plugin</groupId>
1314
<artifactId>plugin-workflow-entity-editor-lib</artifactId>
14-
<version>${project.version}</version>
15+
<version>25.05</version>
1516
</dependency>
1617
</dependencies>
17-
</project>
18+
</project>

‎module-gui/pom.xml‎

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,27 @@
1+
<?xml version='1.0' encoding='UTF-8'?>
12
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
23
<modelVersion>4.0.0</modelVersion>
34
<parent>
45
<groupId>io.goobi.workflow.plugin</groupId>
56
<artifactId>plugin-workflow-entity-editor</artifactId>
6-
<version>25.04</version>
7+
<version>25.05</version>
78
</parent>
89
<artifactId>plugin-workflow-entity-editor-gui</artifactId>
910
<packaging>jar</packaging>
1011
<build>
11-
<resources>
12-
<resource>
13-
<targetPath>META-INF/resources</targetPath>
14-
<directory>src/main/webapp/resources</directory>
15-
</resource>
16-
<resource>
17-
<targetPath>META-INF/tags</targetPath>
18-
<directory>src/main/webapp/tags</directory>
19-
</resource>
20-
<resource>
21-
<targetPath>META-INF</targetPath>
22-
<directory>src/main/resources</directory>
23-
</resource>
24-
</resources>
25-
</build>
26-
</project>
12+
<resources>
13+
<resource>
14+
<targetPath>META-INF/resources</targetPath>
15+
<directory>src/main/webapp/resources</directory>
16+
</resource>
17+
<resource>
18+
<targetPath>META-INF/tags</targetPath>
19+
<directory>src/main/webapp/tags</directory>
20+
</resource>
21+
<resource>
22+
<targetPath>META-INF</targetPath>
23+
<directory>src/main/resources</directory>
24+
</resource>
25+
</resources>
26+
</build>
27+
</project>

‎module-gui/src/main/webapp/resources/uii/includes/edit_relationship_modal.xhtml‎

Lines changed: 116 additions & 107 deletions
Large diffs are not rendered by default.

‎module-gui/src/main/webapp/resources/uii/includes/geonames_search_modal.xhtml‎

Lines changed: 179 additions & 183 deletions
Large diffs are not rendered by default.

‎module-gui/src/main/webapp/resources/uii/includes/image_modal.xhtml‎

Lines changed: 26 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -13,44 +13,39 @@
1313

1414
<composite:implementation>
1515
<h:panelGroup
16-
styleClass="modal"
16+
styleClass="modal fade"
1717
layout="block"
1818
id="imageBox"
1919
tabindex="-1"
2020
role="dialog"
2121
aria-labelledby="imageBox"
2222
aria-hidden="true">
2323

24-
<div class="modal-content-wrapper">
25-
<div
26-
class="modal-dialog"
27-
role="document">
28-
<h:panelGroup
29-
styleClass="modal-content"
30-
layout="block"
31-
id="imageBoxContent">
32-
<h:form
33-
styleClass="form-horizontal"
34-
prependId="false">
35-
<div class="modal-header">
36-
<button
37-
type="button"
38-
class="close"
39-
data-bs-dismiss="modal"
40-
aria-label="Close">
41-
<span aria-hidden="true"> <h:outputText
42-
value="&amp;times;"
43-
escape="false" />
44-
</span>
45-
</button>
46-
<h4
47-
class="modal-title"
48-
style="width: 90%">#{NavigationForm.workflowPlugin.imageName}</h4>
49-
</div>
50-
<img src="#{NavigationForm.workflowPlugin.imageUrl}" />
51-
</h:form>
52-
</h:panelGroup>
53-
</div>
24+
<div
25+
class="modal-dialog"
26+
role="document">
27+
<h:panelGroup
28+
styleClass="modal-content"
29+
layout="block"
30+
id="imageBoxContent">
31+
<h:form
32+
styleClass="form-horizontal"
33+
prependId="false">
34+
<div class="modal-header">
35+
<h4
36+
class="modal-title">#{NavigationForm.workflowPlugin.imageName}</h4>
37+
38+
<button
39+
type="button"
40+
class="btn text-white"
41+
data-bs-dismiss="modal"
42+
aria-label="Close">
43+
<span class="fa fa-times" aria-hidden="true" />
44+
</button>
45+
</div>
46+
<img src="#{NavigationForm.workflowPlugin.imageUrl}" />
47+
</h:form>
48+
</h:panelGroup>
5449
</div>
5550
</h:panelGroup>
5651

0 commit comments

Comments
 (0)