Merge branch 'develop'

Dockerfile

@@ -14,6 +14,7 @@ ENV DB_USER viewer
 ENV DB_PASSWORD viewer
 ENV SOLR_URL http://solr:8983/solr/collection1
 ENV VIEWER_DOMAIN localhost
+ENV TOMCAT_SAMESITECOOKIES strict
 
 RUN sed -i 's|main$|main contrib|' /etc/apt/sources.list
 RUN apt-get update && \
@@ -35,7 +36,7 @@ RUN git clone --branch=${CONFIG_BRANCH} --depth=1 https://github.com/intranda/go
 	mv /goobi-viewer-core-config/goobi-viewer-core-config/src/main/resources/docker/run.sh / && \
 	mv /goobi-viewer-core-config/goobi-viewer-core-config/src/main/resources/docker/setenv.sh /usr/local/tomcat/bin/setenv.sh && \
 	patch --output=/usr/local/tomcat/conf/server.xml.template /usr/local/tomcat/conf/server.xml </goobi-viewer-core-config/goobi-viewer-core-config/src/main/resources/docker/server.xml.patch && \
-	patch /usr/local/tomcat/conf/context.xml </goobi-viewer-core-config/goobi-viewer-core-config/src/main/resources/docker/context.xml.patch && \
+	patch --output=/usr/local/tomcat/conf/context.xml.template /usr/local/tomcat/conf/context.xml </goobi-viewer-core-config/goobi-viewer-core-config/src/main/resources/docker/context.xml.patch && \
 	rm -rf /goobi-viewer-core-config
 
 RUN mkdir -p /usr/local/tomcat/conf/Catalina/localhost/ && mkdir -p /usr/local/tomcat/webapps/viewer

Jenkinsfile

@@ -21,7 +21,7 @@ pipeline {
         }
       }
       steps {
-              sh 'mvn -f goobi-viewer-theme-reference/pom.xml clean install'
+              sh 'mvn -f goobi-viewer-theme-reference/pom.xml clean verify'
               recordIssues enabledForFailure: true, aggregatingResults: true, tools: [java(), javaDoc()]
               archiveArtifacts artifacts: '**/target/*.war', fingerprint: true, onlyIfSuccessful: true
       }
@@ -30,7 +30,7 @@ pipeline {
     stage('build docker image with config from master branch') {
       agent any
       when {
-        anyOf { branch 'master'; tag "v*" }
+        tag "v*"
       }
       steps {
         script{
@@ -62,9 +62,11 @@ pipeline {
       steps{
         script {
           dockerimage.inside {
-            sh 'test -d /usr/local/tomcat/webapps/viewer && echo "/usr/local/tomcat/webapps/viewer missing or no directory"'
-            sh 'test -d /opt/digiverso/viewer || echo "/opt/digiverso/viewer missing or no directory"'
-            sh 'test -f /usr/local/tomcat/conf/viewer.xml.template || echo "/usr/local/tomcat/conf/viewer.xml.template missing"'
+            sh 'test -d /usr/local/tomcat/webapps/viewer || ( echo "/usr/local/tomcat/webapps/viewer missing or no directory"; exit 1 )'
+            sh 'test -d /opt/digiverso/viewer || ( echo "/opt/digiverso/viewer missing or no directory"; exit 1 )'
+            sh 'test -f /usr/local/tomcat/conf/viewer.xml.template || ( echo "/usr/local/tomcat/conf/viewer.xml.template missing"; exit 1 )'
+            sh 'test -f /usr/local/tomcat/conf/server.xml.template || ( echo "/usr/local/tomcat/conf/server.xml.template missing"; exit 1 )'
+            sh 'test -f /usr/local/tomcat/conf/context.xml.template || ( echo "/usr/local/tomcat/conf/context.xml.template missing"; exit 1 )'
             sh 'envsubst -V'
           }
         }

goobi-viewer-theme-reference/WebContent/resources/themes/reference/css/less/components/bookmarks.less

@@ -24,6 +24,7 @@
 	}
 	&__string {
 		font-weight: 700;
+		color: @fg-header;
 	}
 	&__icon {}
 	/* DROPDOWN */
@@ -39,7 +40,7 @@
 				background: @bg-active;
 			});
 			.mx-light-mode-rules ({
-				background-color: #606060;
+				background-color: @middleblack;
 			});
 		li {
 			border-bottom: none;
@@ -49,7 +50,7 @@
 					background: @bg-hover;
 				});
 				.mx-light-mode-rules ({
-					background-color: #606060;
+					background-color: @middleblackHover;
 				});
 			}
 			&:last-child {}
@@ -86,7 +87,7 @@
 			background: @bg-active;
 		});
 		.mx-light-mode-rules ({
-			background-color: #606060;
+			background-color: @middleblack;
 		});
 		border-top: none;
 	}
@@ -104,7 +105,7 @@
 				background: @bg-hover;
 			});
 			.mx-light-mode-rules ({
-				background-color: #606060;
+				background-color: @middleblackHover;
 			});			
 		}
 	}

goobi-viewer-theme-reference/WebContent/resources/themes/reference/css/less/components/loginNavigation.less

@@ -51,7 +51,7 @@
 						background: @bg-hover;
 					});
 					.mx-light-mode-rules ({
-						background: #565656;
+						background: @middleblackHover;
 					});
 				}
 			}
@@ -84,7 +84,7 @@
 					background: @bg-content-box;
 				});
 				.mx-light-mode-rules ({
-					background: #343434;
+					background: @middleblackContrast;
 				});
 			}
 			&__bookmarks-entry {}

goobi-viewer-theme-reference/WebContent/resources/themes/reference/css/less/constructor.less

@@ -108,6 +108,7 @@
 @import "views/user/userBookmarkSingle.less";
 @import "views/user/userBookmarks.less";
 @import "views/user/userComments.less";
+@import "views/user/contentUploadPage.less";
 @import "views/user/userDashboard.less";
 @import "views/user/userLogin.less";
 @import "views/user/userSavedSearches.less";

goobi-viewer-theme-reference/WebContent/resources/themes/reference/css/less/layout/layout.less

@@ -10,27 +10,27 @@
 
 /* MOBILE OVERLAY */
 .mobile-overlay {
-  display: none;
-  position: fixed;
-  top: 0;
-  right: 0;
-  bottom: 0;
-  left: 0;
-  background-color: rgba(0, 0, 0, 0.75);
-  z-index: 2030;
+	display: none;
+	position: fixed;
+	top: 0;
+	right: 0;
+	bottom: 0;
+	left: 0;
+	background-color: rgba(0, 0, 0, 0.75);
+	z-index: 2030;
 }
 
 /* HEADER */
 .page-header {
-  z-index: 2019;
-  position: fixed;
-  top: 0;
-  left: 0;
-  width: 100vw;
-  background: @bg-general;
-  color: @fg-general;
-  color: var(--fg-header);
-  transition: all 0.175s ease;
+	z-index: 2019;
+	position: fixed;
+	top: 0;
+	left: 0;
+	width: 100vw;
+	background: @bg-general;
+	color: @fg-general;
+	color: var(--fg-header);
+	transition: all 0.175s ease;
   &.-scrolled {
     position: fixed;
     top: 0;
@@ -77,7 +77,7 @@
     }
   }
   &__actions-language,
-  &__actions-bookmark,
+//  &__actions-bookmark,
   &__actions-login,
   &__actions-search-button,
   &__actions-color-switch {

goobi-viewer-theme-reference/WebContent/resources/themes/reference/css/less/misc/resets.less

@@ -53,9 +53,15 @@
 /* FORMS */
 .form-control {
 	.mx-dark-mode-rules ({
+		&:disabled {
+			background: #e9ecef;
+		}
 		background: @fg-general;
 	});
 	.mx-light-mode-rules ({
+		&:disabled {
+			background: #e9ecef;
+		}
 		background: @white;
 	});
     &:focus {}

goobi-viewer-theme-reference/WebContent/resources/themes/reference/css/less/misc/variables.less

@@ -33,7 +33,9 @@
 @ci-hovercolor4: #000; // CI Color 4
 
 @lowerblack: #222;
+@middleblackContrast: #343434;
 @middleblack: #444;
+@middleblackHover: #565656;
 @middlegray: #d5d5d5;
 @neutralgray: #f2f3f4;
 //@blue: #3365a9;

goobi-viewer-theme-reference/WebContent/resources/themes/reference/css/less/views/user/contentUploadPage.less

@@ -0,0 +1,72 @@
+/* ==============================================================
+   Content User Upload Page
+   ==============================================================*/
+
+.user-content-upload {
+	&__table {
+    	background: @bg-content-box;
+    	border: @border;
+    	margin-bottom: 2rem;
+  	}
+	&__table-title {
+	}
+	&__table-title-status,
+	&__table-title-title,
+	&__table-title-date {
+	}
+	&__table-title-status {
+	}
+	&__table-finished-job-link {
+		color: @fg-general;
+		&:hover {
+		}
+	}
+	&__table-entry {
+	    .mx-dark-mode-rules ({
+//			&:nth-child(2n+1) {
+//					background: @bg-content-box;
+//					&:hover {
+//						background-color: @bg-hover;
+//					}
+//			}
+		});
+	    .mx-light-mode-rules ({
+
+		});
+    	&:hover {
+			background-color: @bg-hover;
+    	}
+	    &-status {
+	    }
+	    &-label {
+	    }
+	}
+}
+
+/* BREAKPOINT FOR LARGE DESKTOPS */
+@media screen and (max-width: @largeBreakpoint) {} 
+
+/* BREAKPOINT FOR DESKTOP */
+@media screen and (max-width: @mediumBreakpoint) {}
+
+/* BREAKPOINT FOR TABLETS */
+@media screen and (max-width: @smallBreakpoint) {
+	.user-content-upload {
+		&__table-entry {
+    	.mx-dark-mode-rules ({
+			&:nth-child(2n+1) {
+				background: @bg-hover;
+				&:hover {
+					background-color: @bg-hover;
+				}
+			}
+			});
+		    .mx-light-mode-rules ({
+
+			});
+	}
+	}
+}
+
+/* BREAKPOINT FOR SMARTPHONES */
+@media screen and (max-width: @xSmallBreakpoint) {}

goobi-viewer-theme-reference/WebContent/resources/themes/reference/css/less/views/user/userComments.less

@@ -33,6 +33,17 @@
     }
   }
   &__table-entry {
+    .mx-dark-mode-rules ({
+		&:nth-child(2n+1) {
+				background: @bg-content-box;
+				&:hover {
+					background-color: @bg-hover;
+				}
+		}
+	});
+    .mx-light-mode-rules ({
+
+	});
     &:hover {
       .user-comments__table-entry-action-link {
       }
@@ -49,10 +60,10 @@
     background: @bg-content-box;
     .mx-dark-mode-rules ({
 				border: none;
-			});;
+			});
     .mx-light-mode-rules ({
 				border: 1px solid #ccc;
-			});;
+			});
     &:hover,
     &:active,
     &:focus {

goobi-viewer-theme-reference/WebContent/resources/themes/reference/includes/customJS.xhtml

@@ -48,6 +48,10 @@
 
     	// init cms module functions
     	cmsJS.modules.init();
+
+        viewerJS.thumbnailLoader = new viewerJS.loadThumbnails("#{request.contextPath}#{navigationHelper.getResource('images/image_not_found.png')}",
+               					"#{request.contextPath}#{navigationHelper.getResource('images/thumbnail_access_denied.jpg')}");
+
 
     </script>
     <script src="#{request.contextPath}/resources/themes/#{navigationHelper.theme}/javascript/dist/custom.min.js?${navigationHelper.buildVersion}"></script>

goobi-viewer-theme-reference/WebContent/resources/themes/reference/includes/layout.xhtml

@@ -159,8 +159,6 @@
 					<!-- SIDEBAR WIDGETS -->
 					<ui:insert name="sidebar" />
 
-					<!-- RSS FEED -->
-					<ui:insert name="rssFeed" />
 				</aside>
 
 			</div>
@@ -318,6 +316,10 @@
 	<viewerComponent:modalUserLogin id="userLoginModal" />
 	<viewerComponent:modalUserTerms id="userTermsModal" />
 	<viewerComponent:modalFeedbackForm id="feedbackModal" />
+	<ui:fragment rendered="#{configurationBean.contentUploadEnabled}">
+		<viewerComponent:modalContentUpload id="contentUploadModal" />
+	</ui:fragment>
+
 
 
 	<!-- IE 11 NOT SUPPORTED -->

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>22.04</version>
+	<version>22.05-SNAPSHOT</version>
 	<packaging>war</packaging>
 
 
@@ -43,18 +43,18 @@
 		<dependency>
 			<groupId>io.goobi.viewer</groupId>
 			<artifactId>viewer-core</artifactId>
-			<version>22.04</version>
+			<version>22.05-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>io.goobi.viewer</groupId>
 			<artifactId>viewer-core-config</artifactId>
-			<version>22.04</version>
+			<version>22.05-SNAPSHOT</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>io.goobi.viewer</groupId>
 			<artifactId>viewer-connector</artifactId>
-			<version>22.04</version>
+			<version>22.05-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
 
@@ -72,7 +72,7 @@
 				<dependency>
 					<groupId>io.goobi.viewer.module</groupId>
 					<artifactId>module-crowdsourcing</artifactId>
-					<version>22.04</version>
+					<version>22.05-SNAPSHOT</version>
 				</dependency>
 			</dependencies>
 		</profile>