diff --git a/frontend/public/images/patient-background.svg b/frontend/public/images/patient-background.svg new file mode 100644 index 0000000000..aff3671fdb --- /dev/null +++ b/frontend/public/images/patient-background.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/src/App.js b/frontend/src/App.js index 5d4f6629a2..f2a9268744 100644 --- a/frontend/src/App.js +++ b/frontend/src/App.js @@ -129,22 +129,53 @@ export default function App() { } const logout = () => { - fetch(config.serverBaseUrl + "/Logout", { - //includes the browser sessionId in the Header for Authentication on the backend server - method: "POST", - headers: { - "Content-Type": "application/json", - "X-CSRF-Token": localStorage.getItem("CSRF"), - }, - }) - .then((response) => response.status) - .then(() => { - getUserSessionDetails(); - window.location.href = config.loginRedirect; + if (userSessionDetails.loginMethod === "SAML") { + fetch(config.serverBaseUrl + "/Logout?useSAML=true", { + //includes the browser sessionId in the Header for Authentication on the backend server + method: "POST", + headers: { + "Content-Type": "application/json", + "X-CSRF-Token": localStorage.getItem("CSRF"), + }, }) - .catch((error) => { - console.error(error); - }); + .then((response) => response.text()) + .then((html) => { + const POPUP_HEIGHT = 700; + const POPUP_WIDTH = 600; + const top = + window.outerHeight / 2 + window.screenY - POPUP_HEIGHT / 2; + const left = window.outerWidth / 2 + window.screenX - POPUP_WIDTH / 2; + const newWindow = window.open( + "", + "SAML Popup", + `height=${POPUP_HEIGHT},width=${POPUP_WIDTH},top=${top},left=${left}`, + ); + newWindow.document.write(html); + newWindow.document.close(); + getUserSessionDetails(); + window.location.href = config.loginRedirect; + }) + .catch((error) => { + console.error(error); + }); + } else { + fetch(config.serverBaseUrl + "/Logout", { + //includes the browser sessionId in the Header for Authentication on the backend server + method: "POST", + headers: { + "Content-Type": "application/json", + "X-CSRF-Token": localStorage.getItem("CSRF"), + }, + }) + .then((response) => response.status) + .then(() => { + getUserSessionDetails(); + window.location.href = config.loginRedirect; + }) + .catch((error) => { + console.error(error); + }); + } }; const changeLanguageReact = (lang) => { diff --git a/frontend/src/components/common/PatientHeader.js b/frontend/src/components/common/PatientHeader.js index 6f366c1b6b..617b274a7b 100644 --- a/frontend/src/components/common/PatientHeader.js +++ b/frontend/src/components/common/PatientHeader.js @@ -2,7 +2,6 @@ import React from "react"; import { Grid, Column, Section, Tag } from "@carbon/react"; import { FormattedMessage } from "react-intl"; import Avatar from "react-avatar"; -import GeoPattern from "geopattern"; const PatientHeader = (props) => { const { @@ -23,7 +22,6 @@ const PatientHeader = (props) => { isOrderPage = false, className = "patient-header", } = props; - const patternUrl = GeoPattern.generate(id).toDataUri(); return ( @@ -49,7 +47,7 @@ const PatientHeader = (props) => { size={referringFacility ? "150" : "120"} textSizeRatio={2} style={{ - backgroundImage: `url(${patternUrl})`, + backgroundImage: `url('/images/patient-background.svg')`, backgroundRepeat: "round", }} /> @@ -146,7 +144,7 @@ const PatientHeader = (props) => { size={referringFacility ? "150" : "120"} textSizeRatio={2} style={{ - backgroundImage: `url(${patternUrl})`, + backgroundImage: `url('/images/patient-background.svg')`, backgroundRepeat: "round", }} /> diff --git a/frontend/src/components/layout/search/searchOutput.js b/frontend/src/components/layout/search/searchOutput.js index 54db33a787..6b32c517c2 100644 --- a/frontend/src/components/layout/search/searchOutput.js +++ b/frontend/src/components/layout/search/searchOutput.js @@ -2,14 +2,12 @@ import React from "react"; import { Grid, Column, Section, Tag, Tile } from "@carbon/react"; import { FormattedMessage } from "react-intl"; import Avatar from "react-avatar"; -import GeoPattern from "geopattern"; import { openPatientResults } from "./searchService"; const SearchOutput = ({ patientData, className = "patientHead" }) => { return (
{patientData.map((patient) => { - const patternUrl = GeoPattern.generate(patient.id).toDataUri(); return (
@@ -28,7 +26,7 @@ const SearchOutput = ({ patientData, className = "patientHead" }) => { size={patient.referringFacility ? "50" : "40"} textSizeRatio={2} style={{ - backgroundImage: `url(${patternUrl})`, + backgroundImage: `url('/images/patient-background.svg')`, marginTop: "5px", }} /> diff --git a/src/main/java/org/openelisglobal/login/bean/UserSession.java b/src/main/java/org/openelisglobal/login/bean/UserSession.java index bc52f29aec..1e90d958c2 100644 --- a/src/main/java/org/openelisglobal/login/bean/UserSession.java +++ b/src/main/java/org/openelisglobal/login/bean/UserSession.java @@ -6,7 +6,12 @@ public class UserSession { + public enum LoginMethod { + FORM, SAML, OAUTH, CERT, NONE + } + private Boolean authenticated; + private LoginMethod loginMethod; private String sessionId; private String userId; private String loginName; @@ -25,6 +30,14 @@ public void setAuthenticated(Boolean authenticated) { this.authenticated = authenticated; } + public LoginMethod getLoginMethod() { + return loginMethod; + } + + public void setLoginMethod(LoginMethod loginMethod) { + this.loginMethod = loginMethod; + } + public String getUserId() { return userId; } diff --git a/src/main/java/org/openelisglobal/login/controller/LoginPageController.java b/src/main/java/org/openelisglobal/login/controller/LoginPageController.java index 804b52c271..b304a1f224 100644 --- a/src/main/java/org/openelisglobal/login/controller/LoginPageController.java +++ b/src/main/java/org/openelisglobal/login/controller/LoginPageController.java @@ -17,6 +17,7 @@ import org.openelisglobal.common.util.ConfigurationProperties.Property; import org.openelisglobal.localization.service.LocalizationService; import org.openelisglobal.login.bean.UserSession; +import org.openelisglobal.login.bean.UserSession.LoginMethod; import org.openelisglobal.login.form.LoginForm; import org.openelisglobal.login.valueholder.UserSessionData; import org.openelisglobal.role.service.RoleService; @@ -135,6 +136,7 @@ public UserSession getSesssionDetails(HttpServletRequest request, CsrfToken toke session.setSessionId(request.getSession().getId()); if (authenticated) { SystemUser user = systemUserService.get(getSysUserId(request)); + setLoginMethod(request, session); session.setUserId(user.getId()); session.setLoginName(user.getLoginName()); session.setFirstName(user.getFirstName()); @@ -154,6 +156,16 @@ public UserSession getSesssionDetails(HttpServletRequest request, CsrfToken toke return session; } + private void setLoginMethod(HttpServletRequest request, UserSession session) { + if (Boolean.TRUE.equals(request.getSession().getAttribute("samlSession"))) { + session.setLoginMethod(LoginMethod.SAML); + } else if (Boolean.TRUE.equals(request.getSession().getAttribute("oauthSession"))) { + session.setLoginMethod(LoginMethod.OAUTH); + } else { + session.setLoginMethod(LoginMethod.FORM); + } + } + private void setLabunitRolesForExistingUser(HttpServletRequest request, UserSession session) { Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); diff --git a/src/main/java/org/openelisglobal/security/SecurityConfig.java b/src/main/java/org/openelisglobal/security/SecurityConfig.java index 76c32d15db..7fbcd46eaa 100644 --- a/src/main/java/org/openelisglobal/security/SecurityConfig.java +++ b/src/main/java/org/openelisglobal/security/SecurityConfig.java @@ -270,7 +270,8 @@ protected void configure(HttpSecurity http) throws Exception { .createDefaultAssertionValidator(); authenticationProvider.setAssertionValidator(validator); http.requestMatcher(new SamlRequestedMatcher()).authorizeRequests().anyRequest().authenticated().and() - .saml2Logout().and().saml2Login().authenticationManager(new ProviderManager(authenticationProvider)) + .saml2Logout().logoutUrl("/Logout").and().saml2Login() + .authenticationManager(new ProviderManager(authenticationProvider)) .failureHandler(customAuthenticationFailureHandler()) .successHandler(customAuthenticationSuccessHandler()) .relyingPartyRegistrationRepository(relyingPartyRegistrationRepository()); diff --git a/src/main/resources/static/scripts/lib/ajaxtags-1.2-beta3.jar b/src/main/resources/static/scripts/lib/ajaxtags-1.2-beta3.jar deleted file mode 100644 index b6305aa1eb..0000000000 Binary files a/src/main/resources/static/scripts/lib/ajaxtags-1.2-beta3.jar and /dev/null differ diff --git a/src/main/resources/static/scripts/lib/antlr-2.7.5H3.jar b/src/main/resources/static/scripts/lib/antlr-2.7.5H3.jar deleted file mode 100644 index d02328e20f..0000000000 Binary files a/src/main/resources/static/scripts/lib/antlr-2.7.5H3.jar and /dev/null differ diff --git a/src/main/resources/static/scripts/lib/antlr.jar b/src/main/resources/static/scripts/lib/antlr.jar deleted file mode 100644 index 8850fc6e6a..0000000000 Binary files a/src/main/resources/static/scripts/lib/antlr.jar and /dev/null differ diff --git a/src/main/resources/static/scripts/lib/asm-attrs.jar b/src/main/resources/static/scripts/lib/asm-attrs.jar deleted file mode 100644 index f07bcb2b45..0000000000 Binary files a/src/main/resources/static/scripts/lib/asm-attrs.jar and /dev/null differ diff --git a/src/main/resources/static/scripts/lib/asm.jar b/src/main/resources/static/scripts/lib/asm.jar deleted file mode 100644 index ee0c7ccd2f..0000000000 Binary files a/src/main/resources/static/scripts/lib/asm.jar and /dev/null differ diff --git a/src/main/resources/static/scripts/lib/barbecue-1.0.6b.jar b/src/main/resources/static/scripts/lib/barbecue-1.0.6b.jar deleted file mode 100644 index dbbb12e1b3..0000000000 Binary files a/src/main/resources/static/scripts/lib/barbecue-1.0.6b.jar and /dev/null differ diff --git a/src/main/resources/static/scripts/lib/castor-1.0.5-xml.jar b/src/main/resources/static/scripts/lib/castor-1.0.5-xml.jar deleted file mode 100644 index b75c21617d..0000000000 Binary files a/src/main/resources/static/scripts/lib/castor-1.0.5-xml.jar and /dev/null differ diff --git a/src/main/resources/static/scripts/lib/castor-1.0.5.jar b/src/main/resources/static/scripts/lib/castor-1.0.5.jar deleted file mode 100644 index 8816ed8a61..0000000000 Binary files a/src/main/resources/static/scripts/lib/castor-1.0.5.jar and /dev/null differ diff --git a/src/main/resources/static/scripts/lib/cglib-2.1.3.jar b/src/main/resources/static/scripts/lib/cglib-2.1.3.jar deleted file mode 100644 index ddfbdb05a4..0000000000 Binary files a/src/main/resources/static/scripts/lib/cglib-2.1.3.jar and /dev/null differ diff --git a/src/main/resources/static/scripts/lib/commons-beanutils.jar b/src/main/resources/static/scripts/lib/commons-beanutils.jar deleted file mode 100644 index b1b89c9c92..0000000000 Binary files a/src/main/resources/static/scripts/lib/commons-beanutils.jar and /dev/null differ diff --git a/src/main/resources/static/scripts/lib/commons-codec-1.3.jar b/src/main/resources/static/scripts/lib/commons-codec-1.3.jar deleted file mode 100644 index 957b6752af..0000000000 Binary files a/src/main/resources/static/scripts/lib/commons-codec-1.3.jar and /dev/null differ diff --git a/src/main/resources/static/scripts/lib/commons-collections-2.1.1.jar b/src/main/resources/static/scripts/lib/commons-collections-2.1.1.jar deleted file mode 100644 index 3272f2be69..0000000000 Binary files a/src/main/resources/static/scripts/lib/commons-collections-2.1.1.jar and /dev/null differ diff --git a/src/main/resources/static/scripts/lib/commons-collections4-4.0.jar b/src/main/resources/static/scripts/lib/commons-collections4-4.0.jar deleted file mode 100644 index 4fb2b114aa..0000000000 Binary files a/src/main/resources/static/scripts/lib/commons-collections4-4.0.jar and /dev/null differ diff --git a/src/main/resources/static/scripts/lib/commons-digester.jar b/src/main/resources/static/scripts/lib/commons-digester.jar deleted file mode 100644 index 9765493306..0000000000 Binary files a/src/main/resources/static/scripts/lib/commons-digester.jar and /dev/null differ diff --git a/src/main/resources/static/scripts/lib/commons-fileupload-1.2.1.jar b/src/main/resources/static/scripts/lib/commons-fileupload-1.2.1.jar deleted file mode 100644 index aa209b3887..0000000000 Binary files a/src/main/resources/static/scripts/lib/commons-fileupload-1.2.1.jar and /dev/null differ diff --git a/src/main/resources/static/scripts/lib/commons-fileupload.jar b/src/main/resources/static/scripts/lib/commons-fileupload.jar deleted file mode 100644 index 1ca4a9cd31..0000000000 Binary files a/src/main/resources/static/scripts/lib/commons-fileupload.jar and /dev/null differ diff --git a/src/main/resources/static/scripts/lib/commons-httpclient-3.1.jar b/src/main/resources/static/scripts/lib/commons-httpclient-3.1.jar deleted file mode 100644 index 7c59774aed..0000000000 Binary files a/src/main/resources/static/scripts/lib/commons-httpclient-3.1.jar and /dev/null differ diff --git a/src/main/resources/static/scripts/lib/commons-io-2.4.jar b/src/main/resources/static/scripts/lib/commons-io-2.4.jar deleted file mode 100644 index 90035a4fe0..0000000000 Binary files a/src/main/resources/static/scripts/lib/commons-io-2.4.jar and /dev/null differ diff --git a/src/main/resources/static/scripts/lib/commons-javaflow-20060411.jar b/src/main/resources/static/scripts/lib/commons-javaflow-20060411.jar deleted file mode 100644 index 6f8e8db4ec..0000000000 Binary files a/src/main/resources/static/scripts/lib/commons-javaflow-20060411.jar and /dev/null differ diff --git a/src/main/resources/static/scripts/lib/commons-lang-2.1.jar b/src/main/resources/static/scripts/lib/commons-lang-2.1.jar deleted file mode 100644 index 87b80ab5db..0000000000 Binary files a/src/main/resources/static/scripts/lib/commons-lang-2.1.jar and /dev/null differ diff --git a/src/main/resources/static/scripts/lib/commons-logging.jar b/src/main/resources/static/scripts/lib/commons-logging.jar deleted file mode 100644 index b73a80fab6..0000000000 Binary files a/src/main/resources/static/scripts/lib/commons-logging.jar and /dev/null differ diff --git a/src/main/resources/static/scripts/lib/commons-validator-1.3.1.jar b/src/main/resources/static/scripts/lib/commons-validator-1.3.1.jar deleted file mode 100644 index 55b12b1a98..0000000000 Binary files a/src/main/resources/static/scripts/lib/commons-validator-1.3.1.jar and /dev/null differ diff --git a/src/main/resources/static/scripts/lib/commons-validator.jar b/src/main/resources/static/scripts/lib/commons-validator.jar deleted file mode 100644 index bf76e86c29..0000000000 Binary files a/src/main/resources/static/scripts/lib/commons-validator.jar and /dev/null differ diff --git a/src/main/resources/static/scripts/lib/crypto.jar b/src/main/resources/static/scripts/lib/crypto.jar deleted file mode 100644 index 85e77e6e69..0000000000 Binary files a/src/main/resources/static/scripts/lib/crypto.jar and /dev/null differ diff --git a/src/main/resources/static/scripts/lib/dom4j-1.6.1.jar b/src/main/resources/static/scripts/lib/dom4j-1.6.1.jar deleted file mode 100644 index c8c4dbb92d..0000000000 Binary files a/src/main/resources/static/scripts/lib/dom4j-1.6.1.jar and /dev/null differ diff --git a/src/main/resources/static/scripts/lib/ehcache-1.1.jar b/src/main/resources/static/scripts/lib/ehcache-1.1.jar deleted file mode 100644 index 2bda9162a3..0000000000 Binary files a/src/main/resources/static/scripts/lib/ehcache-1.1.jar and /dev/null differ diff --git a/src/main/resources/static/scripts/lib/encoder-1.2.1.jar b/src/main/resources/static/scripts/lib/encoder-1.2.1.jar deleted file mode 100644 index f0404c8560..0000000000 Binary files a/src/main/resources/static/scripts/lib/encoder-1.2.1.jar and /dev/null differ diff --git a/src/main/resources/static/scripts/lib/hamcrest-core-1.1.jar b/src/main/resources/static/scripts/lib/hamcrest-core-1.1.jar deleted file mode 100644 index 5f1d5ce0c3..0000000000 Binary files a/src/main/resources/static/scripts/lib/hamcrest-core-1.1.jar and /dev/null differ diff --git a/src/main/resources/static/scripts/lib/hamcrest-library-1.1.jar b/src/main/resources/static/scripts/lib/hamcrest-library-1.1.jar deleted file mode 100644 index 40610c9b4a..0000000000 Binary files a/src/main/resources/static/scripts/lib/hamcrest-library-1.1.jar and /dev/null differ diff --git a/src/main/resources/static/scripts/lib/hapi-base-2.3.jar b/src/main/resources/static/scripts/lib/hapi-base-2.3.jar deleted file mode 100644 index 294336b052..0000000000 Binary files a/src/main/resources/static/scripts/lib/hapi-base-2.3.jar and /dev/null differ diff --git a/src/main/resources/static/scripts/lib/hapi-hl7overhttp-2.3.jar b/src/main/resources/static/scripts/lib/hapi-hl7overhttp-2.3.jar deleted file mode 100644 index 38ad9354fb..0000000000 Binary files a/src/main/resources/static/scripts/lib/hapi-hl7overhttp-2.3.jar and /dev/null differ diff --git a/src/main/resources/static/scripts/lib/hapi-structures-v251-2.3.jar b/src/main/resources/static/scripts/lib/hapi-structures-v251-2.3.jar deleted file mode 100644 index 0a74340ab2..0000000000 Binary files a/src/main/resources/static/scripts/lib/hapi-structures-v251-2.3.jar and /dev/null differ diff --git a/src/main/resources/static/scripts/lib/hibernate-3.1.3.jar b/src/main/resources/static/scripts/lib/hibernate-3.1.3.jar deleted file mode 100644 index 43a9938c97..0000000000 Binary files a/src/main/resources/static/scripts/lib/hibernate-3.1.3.jar and /dev/null differ diff --git a/src/main/resources/static/scripts/lib/httpclient-4.2.5.jar b/src/main/resources/static/scripts/lib/httpclient-4.2.5.jar deleted file mode 100644 index 5310588ef2..0000000000 Binary files a/src/main/resources/static/scripts/lib/httpclient-4.2.5.jar and /dev/null differ diff --git a/src/main/resources/static/scripts/lib/httpcore-4.2.4.jar b/src/main/resources/static/scripts/lib/httpcore-4.2.4.jar deleted file mode 100644 index 9f45bd91c3..0000000000 Binary files a/src/main/resources/static/scripts/lib/httpcore-4.2.4.jar and /dev/null differ diff --git a/src/main/resources/static/scripts/lib/iText-2.1.7.jar b/src/main/resources/static/scripts/lib/iText-2.1.7.jar deleted file mode 100644 index 3f2c188223..0000000000 Binary files a/src/main/resources/static/scripts/lib/iText-2.1.7.jar and /dev/null differ diff --git a/src/main/resources/static/scripts/lib/jakarta-oro.jar b/src/main/resources/static/scripts/lib/jakarta-oro.jar deleted file mode 100644 index ed6c60a6fd..0000000000 Binary files a/src/main/resources/static/scripts/lib/jakarta-oro.jar and /dev/null differ diff --git a/src/main/resources/static/scripts/lib/jasperreports-3.7.2.jar b/src/main/resources/static/scripts/lib/jasperreports-3.7.2.jar deleted file mode 100644 index 2f2f8d8fec..0000000000 Binary files a/src/main/resources/static/scripts/lib/jasperreports-3.7.2.jar and /dev/null differ diff --git a/src/main/resources/static/scripts/lib/jasperreports-applet-3.7.2.jar b/src/main/resources/static/scripts/lib/jasperreports-applet-3.7.2.jar deleted file mode 100644 index ddf178d625..0000000000 Binary files a/src/main/resources/static/scripts/lib/jasperreports-applet-3.7.2.jar and /dev/null differ diff --git a/src/main/resources/static/scripts/lib/jbcrypt-0.4.jar b/src/main/resources/static/scripts/lib/jbcrypt-0.4.jar deleted file mode 100644 index c63a15f938..0000000000 Binary files a/src/main/resources/static/scripts/lib/jbcrypt-0.4.jar and /dev/null differ diff --git a/src/main/resources/static/scripts/lib/jcommon-1.0.16.jar b/src/main/resources/static/scripts/lib/jcommon-1.0.16.jar deleted file mode 100644 index 4cd680744b..0000000000 Binary files a/src/main/resources/static/scripts/lib/jcommon-1.0.16.jar and /dev/null differ diff --git a/src/main/resources/static/scripts/lib/jdbc-se2.0.jar b/src/main/resources/static/scripts/lib/jdbc-se2.0.jar deleted file mode 100644 index 7b6e322b12..0000000000 Binary files a/src/main/resources/static/scripts/lib/jdbc-se2.0.jar and /dev/null differ diff --git a/src/main/resources/static/scripts/lib/jdt-compiler-3.1.1.jar b/src/main/resources/static/scripts/lib/jdt-compiler-3.1.1.jar deleted file mode 100644 index d37776aca9..0000000000 Binary files a/src/main/resources/static/scripts/lib/jdt-compiler-3.1.1.jar and /dev/null differ diff --git a/src/main/resources/static/scripts/lib/jfreechart-1.0.13.jar b/src/main/resources/static/scripts/lib/jfreechart-1.0.13.jar deleted file mode 100644 index 83c6993181..0000000000 Binary files a/src/main/resources/static/scripts/lib/jfreechart-1.0.13.jar and /dev/null differ diff --git a/src/main/resources/static/scripts/lib/jmock-2.5.1.jar b/src/main/resources/static/scripts/lib/jmock-2.5.1.jar deleted file mode 100644 index 4415dfbc94..0000000000 Binary files a/src/main/resources/static/scripts/lib/jmock-2.5.1.jar and /dev/null differ diff --git a/src/main/resources/static/scripts/lib/jmock-junit4-2.5.1.jar b/src/main/resources/static/scripts/lib/jmock-junit4-2.5.1.jar deleted file mode 100644 index fb3697af4b..0000000000 Binary files a/src/main/resources/static/scripts/lib/jmock-junit4-2.5.1.jar and /dev/null differ diff --git a/src/main/resources/static/scripts/lib/json_simple-1.1.jar b/src/main/resources/static/scripts/lib/json_simple-1.1.jar deleted file mode 100644 index f395f41471..0000000000 Binary files a/src/main/resources/static/scripts/lib/json_simple-1.1.jar and /dev/null differ diff --git a/src/main/resources/static/scripts/lib/jstl-1.2.jar b/src/main/resources/static/scripts/lib/jstl-1.2.jar deleted file mode 100644 index 0fd275e946..0000000000 Binary files a/src/main/resources/static/scripts/lib/jstl-1.2.jar and /dev/null differ diff --git a/src/main/resources/static/scripts/lib/jta.jar b/src/main/resources/static/scripts/lib/jta.jar deleted file mode 100644 index e0822a9669..0000000000 Binary files a/src/main/resources/static/scripts/lib/jta.jar and /dev/null differ diff --git a/src/main/resources/static/scripts/lib/jta1.0.1.jar b/src/main/resources/static/scripts/lib/jta1.0.1.jar deleted file mode 100644 index b56c2d899b..0000000000 Binary files a/src/main/resources/static/scripts/lib/jta1.0.1.jar and /dev/null differ diff --git a/src/main/resources/static/scripts/lib/junit-4.6.jar b/src/main/resources/static/scripts/lib/junit-4.6.jar deleted file mode 100644 index 00770a4fd4..0000000000 Binary files a/src/main/resources/static/scripts/lib/junit-4.6.jar and /dev/null differ diff --git a/src/main/resources/static/scripts/lib/lims.jar b/src/main/resources/static/scripts/lib/lims.jar deleted file mode 100644 index 4c571833b4..0000000000 Binary files a/src/main/resources/static/scripts/lib/lims.jar and /dev/null differ diff --git a/src/main/resources/static/scripts/lib/log4j-1.2.8.jar b/src/main/resources/static/scripts/lib/log4j-1.2.8.jar deleted file mode 100644 index 493a3ccc13..0000000000 Binary files a/src/main/resources/static/scripts/lib/log4j-1.2.8.jar and /dev/null differ diff --git a/src/main/resources/static/scripts/lib/mockito-all-1.9.5.jar b/src/main/resources/static/scripts/lib/mockito-all-1.9.5.jar deleted file mode 100644 index 00416eb387..0000000000 Binary files a/src/main/resources/static/scripts/lib/mockito-all-1.9.5.jar and /dev/null differ diff --git a/src/main/resources/static/scripts/lib/ojdbc14.jar b/src/main/resources/static/scripts/lib/ojdbc14.jar deleted file mode 100644 index 6d87bf5dfb..0000000000 Binary files a/src/main/resources/static/scripts/lib/ojdbc14.jar and /dev/null differ diff --git a/src/main/resources/static/scripts/lib/postgresql-42.1.4.jar b/src/main/resources/static/scripts/lib/postgresql-42.1.4.jar deleted file mode 100644 index 08a54b105f..0000000000 Binary files a/src/main/resources/static/scripts/lib/postgresql-42.1.4.jar and /dev/null differ diff --git a/src/main/resources/static/scripts/lib/quartz-all-2.0.1.jar b/src/main/resources/static/scripts/lib/quartz-all-2.0.1.jar deleted file mode 100644 index ab102843d2..0000000000 Binary files a/src/main/resources/static/scripts/lib/quartz-all-2.0.1.jar and /dev/null differ diff --git a/src/main/resources/static/scripts/lib/servlet.jar b/src/main/resources/static/scripts/lib/servlet.jar deleted file mode 100644 index 768ac1ec9c..0000000000 Binary files a/src/main/resources/static/scripts/lib/servlet.jar and /dev/null differ diff --git a/src/main/resources/static/scripts/lib/slf4j-api-1.6.1.jar b/src/main/resources/static/scripts/lib/slf4j-api-1.6.1.jar deleted file mode 100644 index 42e0ad0de7..0000000000 Binary files a/src/main/resources/static/scripts/lib/slf4j-api-1.6.1.jar and /dev/null differ diff --git a/src/main/resources/static/scripts/lib/slf4j-simple-1.6.1.jar b/src/main/resources/static/scripts/lib/slf4j-simple-1.6.1.jar deleted file mode 100644 index d894d96aaa..0000000000 Binary files a/src/main/resources/static/scripts/lib/slf4j-simple-1.6.1.jar and /dev/null differ diff --git a/src/main/resources/static/scripts/lib/spring-aop-5.0.2.RELEASE.jar b/src/main/resources/static/scripts/lib/spring-aop-5.0.2.RELEASE.jar deleted file mode 100644 index 06465c6f62..0000000000 Binary files a/src/main/resources/static/scripts/lib/spring-aop-5.0.2.RELEASE.jar and /dev/null differ diff --git a/src/main/resources/static/scripts/lib/spring-beans-5.0.2.RELEASE.jar b/src/main/resources/static/scripts/lib/spring-beans-5.0.2.RELEASE.jar deleted file mode 100644 index 96224b5257..0000000000 Binary files a/src/main/resources/static/scripts/lib/spring-beans-5.0.2.RELEASE.jar and /dev/null differ diff --git a/src/main/resources/static/scripts/lib/spring-context-5.0.2.RELEASE.jar b/src/main/resources/static/scripts/lib/spring-context-5.0.2.RELEASE.jar deleted file mode 100644 index 486f51f1ca..0000000000 Binary files a/src/main/resources/static/scripts/lib/spring-context-5.0.2.RELEASE.jar and /dev/null differ diff --git a/src/main/resources/static/scripts/lib/spring-core-5.0.2.RELEASE.jar b/src/main/resources/static/scripts/lib/spring-core-5.0.2.RELEASE.jar deleted file mode 100644 index 13e5eef20b..0000000000 Binary files a/src/main/resources/static/scripts/lib/spring-core-5.0.2.RELEASE.jar and /dev/null differ diff --git a/src/main/resources/static/scripts/lib/spring-expression-5.0.2.RELEASE.jar b/src/main/resources/static/scripts/lib/spring-expression-5.0.2.RELEASE.jar deleted file mode 100644 index 67a0d385d5..0000000000 Binary files a/src/main/resources/static/scripts/lib/spring-expression-5.0.2.RELEASE.jar and /dev/null differ diff --git a/src/main/resources/static/scripts/lib/spring-jcl-5.0.2.RELEASE.jar b/src/main/resources/static/scripts/lib/spring-jcl-5.0.2.RELEASE.jar deleted file mode 100644 index 1d0bbabcbc..0000000000 Binary files a/src/main/resources/static/scripts/lib/spring-jcl-5.0.2.RELEASE.jar and /dev/null differ diff --git a/src/main/resources/static/scripts/lib/spring-web-5.0.2.RELEASE.jar b/src/main/resources/static/scripts/lib/spring-web-5.0.2.RELEASE.jar deleted file mode 100644 index b829646982..0000000000 Binary files a/src/main/resources/static/scripts/lib/spring-web-5.0.2.RELEASE.jar and /dev/null differ diff --git a/src/main/resources/static/scripts/lib/spring-webmvc-5.0.2.RELEASE.jar b/src/main/resources/static/scripts/lib/spring-webmvc-5.0.2.RELEASE.jar deleted file mode 100644 index d4556de24f..0000000000 Binary files a/src/main/resources/static/scripts/lib/spring-webmvc-5.0.2.RELEASE.jar and /dev/null differ diff --git a/src/main/resources/static/scripts/lib/standard.jar b/src/main/resources/static/scripts/lib/standard.jar deleted file mode 100644 index bc528acb94..0000000000 Binary files a/src/main/resources/static/scripts/lib/standard.jar and /dev/null differ diff --git a/src/main/resources/static/scripts/lib/struts.jar b/src/main/resources/static/scripts/lib/struts.jar deleted file mode 100644 index 855839aadd..0000000000 Binary files a/src/main/resources/static/scripts/lib/struts.jar and /dev/null differ diff --git a/src/main/resources/static/scripts/lib/struts2-core-2.0.9.jar b/src/main/resources/static/scripts/lib/struts2-core-2.0.9.jar deleted file mode 100644 index 608765b87f..0000000000 Binary files a/src/main/resources/static/scripts/lib/struts2-core-2.0.9.jar and /dev/null differ diff --git a/src/main/resources/static/scripts/lib/struts2-spring-plugin-2.0.6.jar b/src/main/resources/static/scripts/lib/struts2-spring-plugin-2.0.6.jar deleted file mode 100644 index 4a9094e2e2..0000000000 Binary files a/src/main/resources/static/scripts/lib/struts2-spring-plugin-2.0.6.jar and /dev/null differ diff --git a/src/main/resources/static/scripts/lib/tiles-api-3.0.8.jar b/src/main/resources/static/scripts/lib/tiles-api-3.0.8.jar deleted file mode 100644 index c3ebb86221..0000000000 Binary files a/src/main/resources/static/scripts/lib/tiles-api-3.0.8.jar and /dev/null differ diff --git a/src/main/resources/static/scripts/lib/tiles-autotag-core-runtime-1.2.jar b/src/main/resources/static/scripts/lib/tiles-autotag-core-runtime-1.2.jar deleted file mode 100644 index fe5166ec5f..0000000000 Binary files a/src/main/resources/static/scripts/lib/tiles-autotag-core-runtime-1.2.jar and /dev/null differ diff --git a/src/main/resources/static/scripts/lib/tiles-core-3.0.8.jar b/src/main/resources/static/scripts/lib/tiles-core-3.0.8.jar deleted file mode 100644 index f9364ac772..0000000000 Binary files a/src/main/resources/static/scripts/lib/tiles-core-3.0.8.jar and /dev/null differ diff --git a/src/main/resources/static/scripts/lib/tiles-extras-3.0.8.jar b/src/main/resources/static/scripts/lib/tiles-extras-3.0.8.jar deleted file mode 100644 index 23e5946e98..0000000000 Binary files a/src/main/resources/static/scripts/lib/tiles-extras-3.0.8.jar and /dev/null differ diff --git a/src/main/resources/static/scripts/lib/tiles-jsp-3.0.8.jar b/src/main/resources/static/scripts/lib/tiles-jsp-3.0.8.jar deleted file mode 100644 index a3ed1582fd..0000000000 Binary files a/src/main/resources/static/scripts/lib/tiles-jsp-3.0.8.jar and /dev/null differ diff --git a/src/main/resources/static/scripts/lib/tiles-request-api-1.0.7.jar b/src/main/resources/static/scripts/lib/tiles-request-api-1.0.7.jar deleted file mode 100644 index 7cc79c83f6..0000000000 Binary files a/src/main/resources/static/scripts/lib/tiles-request-api-1.0.7.jar and /dev/null differ diff --git a/src/main/resources/static/scripts/lib/tiles-request-jsp-1.0.7.jar b/src/main/resources/static/scripts/lib/tiles-request-jsp-1.0.7.jar deleted file mode 100644 index 0094b25fc3..0000000000 Binary files a/src/main/resources/static/scripts/lib/tiles-request-jsp-1.0.7.jar and /dev/null differ diff --git a/src/main/resources/static/scripts/lib/tiles-request-servlet-1.0.7.jar b/src/main/resources/static/scripts/lib/tiles-request-servlet-1.0.7.jar deleted file mode 100644 index 0f87c7f696..0000000000 Binary files a/src/main/resources/static/scripts/lib/tiles-request-servlet-1.0.7.jar and /dev/null differ diff --git a/src/main/resources/static/scripts/lib/tiles-servlet-3.0.8.jar b/src/main/resources/static/scripts/lib/tiles-servlet-3.0.8.jar deleted file mode 100644 index 02badf0379..0000000000 Binary files a/src/main/resources/static/scripts/lib/tiles-servlet-3.0.8.jar and /dev/null differ diff --git a/src/main/webapp/pages/common/banner.jsp b/src/main/webapp/pages/common/banner.jsp index eb13dadac5..b556f30e37 100644 --- a/src/main/webapp/pages/common/banner.jsp +++ b/src/main/webapp/pages/common/banner.jsp @@ -115,7 +115,7 @@ jQuery(document).ready(function() {
- +
" class="btn-link"/>