Merge branch 'develop'

intranda · Jul 8, 2024 · a51c67f · a51c67f
2 parents b7051c0 + 7ecf731
commit a51c67f
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 21 deletions.
diff --git a/...heme-reference/WebContent/resources/themes/reference/css/less/widgets/widgetCitation.less b/...heme-reference/WebContent/resources/themes/reference/css/less/widgets/widgetCitation.less
@@ -5,6 +5,7 @@
 #widgetCitation {}
 .widget-citation {
 	&__topbar {}
+	&__title {}
 	&__license-text {
 		a {
 		}

diff --git a/goobi-viewer-theme-reference/WebContent/resources/themes/reference/includes/customJS.xhtml b/goobi-viewer-theme-reference/WebContent/resources/themes/reference/includes/customJS.xhtml
@@ -59,8 +59,8 @@
 
 
     </script>
-    <script src="#{request.contextPath}/resources/themes/#{navigationHelper.theme}/javascript/dist/custom.min.js?${navigationHelper.buildVersion}&amp;cachetimestamp=2022-9-1-10-5-6"></script>
-    <script src="#{request.contextPath}/resources/themes/#{navigationHelper.theme}/javascript/dist/#{navigationHelper.theme}-tags.js?${navigationHelper.buildVersion}&amp;cachetimestamp=2022-9-1-10-5-6"></script>
+    <script src="#{request.contextPath}/resources/themes/#{navigationHelper.theme}/javascript/dist/custom.min.js?${navigationHelper.buildVersion}&amp;cachetimestamp=2024-7-4-9-21-35"></script>
+    <script src="#{request.contextPath}/resources/themes/#{navigationHelper.theme}/javascript/dist/#{navigationHelper.theme}-tags.js?${navigationHelper.buildVersion}&amp;cachetimestamp=2024-7-4-9-21-35"></script>
     	<script>
     	//TODO: replace with better solution so colorTheme gets set earlier
         	// switchTheme(#{sessionBean.get('colorTheme')});

diff --git a/goobi-viewer-theme-reference/WebContent/resources/themes/reference/template.html b/goobi-viewer-theme-reference/WebContent/resources/themes/reference/template.html
@@ -58,7 +58,7 @@
     <ui:include src="/resources/includes/templateHeads/css.xhtml">
       <ui:param name="templateName" value="#{templateName}" />
       <ui:param name="excludeCSS" value="#{excludeCSS}" />
-      <ui:param name="cacheBuster" value="cachetimestamp=2022-9-1-10-5-6" />
+      <ui:param name="cacheBuster" value="cachetimestamp=2024-7-4-9-21-35" />
     </ui:include>
 
     <!-- SUBTHEME CSS -->
@@ -83,7 +83,7 @@
     <ui:include src="/resources/includes/templateHeads/js.xhtml">
       <ui:param name="templateName" value="#{templateName}" />
       <ui:param name="excludeJS" value="#{excludeJS}" />
-	  <ui:param name="cacheBuster" value="cachetimestamp=2022-9-1-10-5-6" />
+	  <ui:param name="cacheBuster" value="cachetimestamp=2024-7-4-9-21-35" />
     </ui:include>
 
 	<!-- QUICK JS IN VIEWER BACKEND - ADDS <script> NODE - INSERTED WITH INCLUDE FOR CORRECT IDE VALIDATION -->

diff --git a/goobi-viewer-theme-reference/WebContent/resources/themes/reference/templateAdmin.html b/goobi-viewer-theme-reference/WebContent/resources/themes/reference/templateAdmin.html
@@ -43,14 +43,14 @@
     <ui:include src="/resources/includes/templateHeads/css.xhtml">
       <ui:param name="templateName" value="#{templateName}" />
       <ui:param name="excludeCSS" value="#{excludeCSS}" />
-      <ui:param name="cacheBuster" value="-cachetimestamp=2022-9-1-10-5-6" />
+      <ui:param name="cacheBuster" value="-cachetimestamp=2024-7-4-9-21-35" />
     </ui:include>
 
     <!-- JAVASCRIPT -->
     <ui:include src="/resources/includes/templateHeads/js.xhtml">
       <ui:param name="templateName" value="#{templateName}" />
       <ui:param name="excludeJS" value="#{excludeJS}" />
-      <ui:param name="cacheBuster" value="-cachetimestamp=2022-9-1-10-5-6" />
+      <ui:param name="cacheBuster" value="-cachetimestamp=2024-7-4-9-21-35" />
     </ui:include>
 
   </h:head>

diff --git a/goobi-viewer-theme-reference/WebContent/resources/themes/reference/templateArchives.html b/goobi-viewer-theme-reference/WebContent/resources/themes/reference/templateArchives.html
@@ -52,7 +52,7 @@
     <ui:include src="/resources/includes/templateHeads/css.xhtml">
       <ui:param name="templateName" value="#{templateName}" />
       <ui:param name="excludeCSS" value="#{excludeCSS}" />
-      <ui:param name="cacheBuster" value="-cachetimestamp=2022-9-1-10-5-6" />
+      <ui:param name="cacheBuster" value="-cachetimestamp=2024-7-4-9-21-35" />
     </ui:include>
 
 	 <!-- QUICK CSS IN VIEWER BACKEND - ADDS <style> NODE - INSERTED WITH INCLUDE FOR CORRECT IDE VALIDATION -->
@@ -72,7 +72,7 @@
     <ui:include src="/resources/includes/templateHeads/js.xhtml">
       <ui:param name="templateName" value="#{templateName}" />
       <ui:param name="excludeJS" value="#{excludeJS}" />
-      <ui:param name="cacheBuster" value="-cachetimestamp=2022-9-1-10-5-6" />
+      <ui:param name="cacheBuster" value="-cachetimestamp=2024-7-4-9-21-35" />
     </ui:include>
 
 	<!-- QUICK JS IN VIEWER BACKEND - ADDS <script> NODE - INSERTED WITH INCLUDE FOR CORRECT IDE VALIDATION -->

diff --git a/goobi-viewer-theme-reference/WebContent/resources/themes/reference/templateBlank.html b/goobi-viewer-theme-reference/WebContent/resources/themes/reference/templateBlank.html
@@ -57,7 +57,7 @@
     <ui:include src="/resources/includes/templateHeads/css.xhtml">
       <ui:param name="templateName" value="#{templateName}" />
       <ui:param name="excludeCSS" value="#{excludeCSS}" />
-      <ui:param name="cacheBuster" value="-cachetimestamp=2022-9-1-10-5-6" />
+      <ui:param name="cacheBuster" value="-cachetimestamp=2024-7-4-9-21-35" />
     </ui:include>
 
     <!-- SUBTHEME CSS -->
@@ -69,7 +69,7 @@
     <ui:include src="/resources/includes/templateHeads/js.xhtml">
       <ui:param name="templateName" value="#{templateName}" />
       <ui:param name="excludeJS" value="#{excludeJS}" />
-      <ui:param name="cacheBuster" value="-cachetimestamp=2022-9-1-10-5-6" />
+      <ui:param name="cacheBuster" value="-cachetimestamp=2024-7-4-9-21-35" />
     </ui:include>
 
   </h:head>

diff --git a/...i-viewer-theme-reference/WebContent/resources/themes/reference/templateBlankUnstyled.html b/...i-viewer-theme-reference/WebContent/resources/themes/reference/templateBlankUnstyled.html
@@ -43,14 +43,14 @@
     <ui:include src="/resources/includes/templateHeads/css.xhtml">
       <ui:param name="templateName" value="#{templateName}" />
       <ui:param name="excludeCSS" value="#{excludeCSS}" />
-      <ui:param name="cacheBuster" value="-cachetimestamp=2022-9-1-10-5-6" />
+      <ui:param name="cacheBuster" value="-cachetimestamp=2024-7-4-9-21-35" />
     </ui:include>
 
 	<!-- JAVASCRIPT -->
 	<ui:include src="/resources/includes/templateHeads/js.xhtml">
 		<ui:param name="templateName" value="#{templateName}" />
 		<ui:param name="excludeJS" value="#{excludeJS}" />
-      	<ui:param name="cacheBuster" value="-cachetimestamp=2022-9-1-10-5-6" />
+      	<ui:param name="cacheBuster" value="-cachetimestamp=2024-7-4-9-21-35" />
 	</ui:include>
 
 </h:head>

diff --git a/...i-viewer-theme-reference/WebContent/resources/themes/reference/templateCrowdsourcing.html b/...i-viewer-theme-reference/WebContent/resources/themes/reference/templateCrowdsourcing.html
@@ -42,7 +42,7 @@
     <ui:include src="/resources/includes/templateHeads/css.xhtml">
       <ui:param name="templateName" value="#{templateName}" />
       <ui:param name="excludeCSS" value="#{excludeCSS}" />
-      <ui:param name="cacheBuster" value="-cachetimestamp=2022-9-1-10-5-6" />
+      <ui:param name="cacheBuster" value="-cachetimestamp=2024-7-4-9-21-35" />
     </ui:include>
 
 	<!-- CUSTOM CSS + DIST FILES -->
@@ -65,7 +65,7 @@
     <ui:include src="/resources/includes/templateHeads/js.xhtml">
       <ui:param name="templateName" value="#{templateName}" />
       <ui:param name="excludeJS" value="#{excludeJS}" />
-      <ui:param name="cacheBuster" value="-cachetimestamp=2022-9-1-10-5-6" />
+      <ui:param name="cacheBuster" value="-cachetimestamp=2024-7-4-9-21-35" />
     </ui:include>
 
 	<!-- QUICK JS IN VIEWER BACKEND - ADDS <script> NODE - INSERTED WITH INCLUDE FOR CORRECT IDE VALIDATION -->

diff --git a/goobi-viewer-theme-reference/WebContent/resources/themes/reference/templateFullscreen.html b/goobi-viewer-theme-reference/WebContent/resources/themes/reference/templateFullscreen.html
@@ -66,7 +66,7 @@
 	<ui:include src="/resources/includes/templateHeads/css.xhtml">
 		<ui:param name="templateName" value="#{templateName}" />
 		<ui:param name="excludeCSS" value="#{excludeCSS}" />
-      	<ui:param name="cacheBuster" value="-cachetimestamp=2022-9-1-10-5-6" />
+      	<ui:param name="cacheBuster" value="-cachetimestamp=2024-7-4-9-21-35" />
 	</ui:include>
 
 	<!-- SUBTHEME CSS -->
@@ -93,7 +93,7 @@
 	<ui:include src="/resources/includes/templateHeads/js.xhtml">
 		<ui:param name="templateName" value="#{templateName}" />
 		<ui:param name="excludeJS" value="#{excludeJS}" />
-      	<ui:param name="cacheBuster" value="-cachetimestamp=2022-9-1-10-5-6" />
+      	<ui:param name="cacheBuster" value="-cachetimestamp=2024-7-4-9-21-35" />
 	</ui:include>
 
 	<!-- QUICK JS IN VIEWER BACKEND - ADDS <script> NODE - INSERTED WITH INCLUDE FOR CORRECT IDE VALIDATION -->

diff --git a/goobi-viewer-theme-reference/pom.xml b/goobi-viewer-theme-reference/pom.xml
@@ -6,7 +6,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>io.goobi.viewer.theme</groupId>
 	<artifactId>theme-reference</artifactId>
-	<version>24.05</version>
+	<version>24.06-SNAPSHOT</version>
 	<packaging>war</packaging>
 
 
@@ -43,18 +43,18 @@
 		<dependency>
 			<groupId>io.goobi.viewer</groupId>
 			<artifactId>viewer-core</artifactId>
-			<version>24.05</version>
+			<version>24.06-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>io.goobi.viewer</groupId>
 			<artifactId>viewer-core-config</artifactId>
-			<version>24.05</version>
+			<version>24.06-SNAPSHOT</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>io.goobi.viewer</groupId>
 			<artifactId>viewer-connector</artifactId>
-			<version>24.05</version>
+			<version>24.06-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
 
@@ -72,7 +72,7 @@
 				<dependency>
 					<groupId>io.goobi.viewer.module</groupId>
 					<artifactId>module-crowdsourcing</artifactId>
-					<version>24.05</version>
+					<version>24.06-SNAPSHOT</version>
 				</dependency>
 			</dependencies>
 		</profile>