From 11922e0509991332de8ceccc74c3924b588bd65e Mon Sep 17 00:00:00 2001
From: Massimiliano Assante <massimiliano.assante@isti.cnr.it>
Date: Thu, 25 Feb 2021 17:21:55 +0100
Subject: [PATCH] disabled LR login if a user is redirected there by old pages

---
 src/main/resources/portal.properties          |  2 +-
 .../custom_jsps/html/portlet/login/login.jsp  | 63 +++----------------
 2 files changed, 11 insertions(+), 54 deletions(-)

diff --git a/src/main/resources/portal.properties b/src/main/resources/portal.properties
index deb0815..9399299 100644
--- a/src/main/resources/portal.properties
+++ b/src/main/resources/portal.properties
@@ -10,4 +10,4 @@
 ##																														 ##
 ###########################################################################################################################
 
-login.form.navigation.socials=shibboleth, google, linkedIn
\ No newline at end of file
+login.form.navigation.socials=
\ No newline at end of file
diff --git a/src/main/webapp/META-INF/custom_jsps/html/portlet/login/login.jsp b/src/main/webapp/META-INF/custom_jsps/html/portlet/login/login.jsp
index 4ca99c9..8f5ea55 100644
--- a/src/main/webapp/META-INF/custom_jsps/html/portlet/login/login.jsp
+++ b/src/main/webapp/META-INF/custom_jsps/html/portlet/login/login.jsp
@@ -202,41 +202,17 @@
 														loginLabel = "id";
 													}
 							%>
-							<div class="custom-form-login-wrapper">
-								<aui:input
-									autoFocus="<%=windowState.equals(LiferayWindowState.EXCLUSIVE)
-											|| windowState.equals(WindowState.MAXIMIZED)%>"
-									cssClass="clearable login-identifier input-xlarge"
-									placeholder="<%=loginLabel%>" label="" name="login"
-									showRequiredLabel="<%=false%>" type="text">
-									<aui:validator name="required" />
-								</aui:input>
-
-								<aui:input name="password" placeholder="password"
-									cssClass="login-password input-xlarge" label=""
-									showRequiredLabel="<%=false%>" type="password"
-									value="<%=password%>">
-									<aui:validator name="required" />
-								</aui:input>
-
-								<aui:button type="submit"
-									cssClass="login-sign-in-button input-xlarge" value="sign-in" />
-
-								<span id="<portlet:namespace />passwordCapsLockSpan"
-									style="display: none;"><liferay-ui:message
-										key="caps-lock-is-on" /></span>
-
-								<c:if
-									test="<%=company.isAutoLogin() && !PropsValues.SESSION_DISABLED%>">
-									<div class="login-remember-me">
-										<aui:input checked="<%=rememberMe%>" name="rememberMe"
-											type="checkbox" />
-									</div>
-								</c:if>
-							</div>
+		
 						</aui:fieldset>
 
 					</aui:form>
+										<!--  PATCH 25 2 2021 -->
+							<div style="text-align: center;">
+							<div class="description"> <p>Login page was moved to a new location:</p> </div>
+							<button class="btn input-xlarge btn-fill"
+								onClick="location.href='<%=siteUrl%>'">Sign In or Create Account</button>
+							</div>
+							<!--  END PATCH 25 2 2021 -->
 					<c:if test="<%=hideCreateAccountAndForgotPassword == true%>">
 						<%
 							Map<String, String> queryMap = AuthUtil.getQueryMap(redirect);
@@ -251,27 +227,8 @@
 								Access</button>
 						</div>
 					</c:if>
-					<liferay-util:include page="/html/portlet/login/navigation.jsp" />
-			</div>
-			<div class="span6">
-				<c:if test="<%=socials.length > 0%>">
-					<div class="accordion" id="accordion" role="tablist">
-						<div class="accordion-group">
-							<div class="accordion-inner">
-								<liferay-util:include page="/html/portlet/login/social.jsp" />
-							</div>
-						</div>
-<!-- 						<div class="span12"> -->
-<!-- 							<div class="span3"></div> -->
-<!-- 							<div class="span6 text-center"> -->
-<!-- 								<p class="text-info" id="note-text-accounts">Please note: it is possible -->
-<!-- 									connect and existing account once logged in. If a new e-mail address is -->
-<!-- 									used, a new account will be automatically created.</p> -->
-<!-- 							</div> -->
-<!-- 							<div class="span3"></div> -->
-<!-- 						</div> -->
-					</div>
-				</c:if>
+					
+<!-- 					<liferay-util:include page="/html/portlet/login/navigation.jsp" /> -->
 			</div>
 			<!-- END CLIENT NOT AUTHORISED -->
 			</c:if>