gCubeSystem
/
login-hook
16
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portal/liferay62-plugins/login-hook@173823 82a268e6-3cf1-43bd-a215-b396298e98cf

This commit is contained in:
Massimiliano Assante 2018-10-25 14:31:01 +00:00
parent 3d401debb0
commit 55b1419bc0
8 changed files with 303 additions and 187 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
distro/changelog.xml
View File

@ -1,4 +1,7 @@
<ReleaseNotes>
<Changeset component="gr.cite.login.login-hook.1-2-0" date="2018-10-25">
<Change>Restyled login page</Change>
</Changeset>
<Changeset component="gr.cite.login.login-hook.1-2-0" date="2017-02-06">
<Change>Implemented support for oAuth 2</Change>
</Changeset>

2
pom.xml
View File

@ -14,7 +14,7 @@
<artifactId>login-hook</artifactId>
<packaging>war</packaging>
<name>login-hook Hook</name>
<version>1.3.1-SNAPSHOT</version>
<version>1.4.0-SNAPSHOT</version>
<scm>
<connection>scm:svn:https://svn.d4science.research-infrastructures.eu/gcube/branches/portal/login-hook/1.2</connection>

2
src/main/resources/portal.properties
View File

@ -10,4 +10,4 @@
## ##
###########################################################################################################################
login.form.navigation.socials=google, linkedIn
login.form.navigation.socials=google, linkedIn, shibboleth

54
src/main/webapp/META-INF/custom_jsps/html/portlet/login/css/login-hook.css
View File

@ -1,3 +1,21 @@
.aui .portlet {
background-color: transparent;
border: none;
}
.aui .portlet-topper {
background-color: transparent;
display: none;
}
.portlet-login .accordion {
margin-top: 40px;
}
.portlet-login div.navigation, #signinmodal div.navigation {
background: none;
background-color: transparent;
}
.portlet-login .accordion .accordion-heading > a, #signinmodal .accordion .accordion-heading > a{
display: block;
text-align: center;
@ -11,11 +29,21 @@
border-top: none;
}
.portlet-login div.navigation, #signinmodal div.navigation {
background: white;
border-top: none;
.portlet-login #d4s-signin-form {
background-color: transparent;
padding: 5px;
border-radius: 6px;
}
.portlet-login input:-webkit-autofill, textarea:-webkit-autofill, select:-webkit-autofill {
background-color: white !important;
}
/* .portlet-login div.navigation, #signinmodal div.navigation { */
/* background: white; */
/* border-top: none; */
/* } */
.portlet-login input.login-identifier, .portlet-login input.login-password,
#signinmodal input.login-identifier, #signinmodal input.login-password {
border-radius: 5px;
@ -38,7 +66,12 @@
}
.portlet-login .portlet-content-container .login-sign-in {
display:none;
font-size: 16px;
font-weight: 400;
line-height: 2.2;
color: #01497C;
text-align: left;
padding: 0 10px 10px;
}
.portlet-login .login-remember-me, #signinmodal .login-remember-me {
@ -51,10 +84,11 @@
}
.portlet-login .navigation li[role=presentation] > a,
#signinmodal .navigation li[role=presentation] > a,
.portlet-login .login-remember-me label,
#signinmodal .login-remember-me label {
color: #9E9696;
#signinmodal .navigation li[role=presentation] > a {
color: #01497C;
font-size: 1.2em;
font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
line-height: 20px;
}
.portlet-login form, #signinmodal form{
@ -66,7 +100,7 @@
}
.portlet-login .navigation, #signinmodal .navigation{
padding : 0px 10px 10px 10px;
padding : 10px;
}
.portlet-login .custom-form-login-wrapper, #signinmodal .custom-form-login-wrapper{
@ -86,5 +120,5 @@
.portlet-login .social,
#signinmodal .social {
margin-bottom: 5px;
margin-bottom: 15px;
}

47
src/main/webapp/META-INF/custom_jsps/html/portlet/login/login.jsp
View File

@ -74,15 +74,19 @@
String workSpaceMarkUp = "<a href=\"" + HtmlUtil.escape(workspaceUrl) + "\">"
+ LanguageUtil.get(pageContext, "shared-workspace") + "</a>";
%>
<div id="note-text-loggedin" style="font-size: 1.5em; line-height: 20px;">
<%=LanguageUtil.format(pageContext, "you-are-signed-in-as-x", signedInAs, false)%>
<br>
<br>
<%=LanguageUtil.format(pageContext, "go-to-x", siteMarkUp, false)%>
<br>
<br>
<%=LanguageUtil.format(pageContext, "go-to-x", workSpaceMarkUp, false)%>
</div>
</c:when>
<c:otherwise>
<div class="row-fluid">
<div class="span6 text-center" id="d4s-signin-form">
<%
String redirect = ParamUtil.getString(request, "redirect");
%>
@ -92,7 +96,7 @@
<!-- end include for recognising requesting apps-->
<h4 class="login-sign-in"><%=LanguageUtil.get(pageContext, "sign-in")%></h4>
<div class="login-sign-in">&nbsp;</div>
<%
String login = LoginUtil.getLogin(request, "login", company);
@ -120,7 +124,8 @@
value="<%=portletName.equals(PortletKeys.FAST_LOGIN) ? true : false%>" />
<c:choose>
<c:when test='<%=SessionMessages.contains(request, "userAdded")%>'>
<c:when
test='<%=SessionMessages.contains(request, "userAdded")%>'>
<%
String userEmailAddress = (String) SessionMessages.get(request, "userAdded");
@ -236,38 +241,38 @@
<%
Map<String, String> queryMap = AuthUtil.getQueryMap(redirect);
String redirectURI = queryMap.get(GET_REDIRECTURL_PARAMETER);
String responseWithError = redirectURI+"?error=user_cancelled_login&error_description=refused%2flogin&state="+queryMap.get(GET_STATE_PARAMETER);
String responseWithError = redirectURI
+ "?error=user_cancelled_login&error_description=refused%2flogin&state="
+ queryMap.get(GET_STATE_PARAMETER);
%>
<div style="text-align: center;">
<button class="btn input-xlarge"
onClick="location.href='<%=responseWithError%>'">Deny Access</button>
onClick="location.href='<%=responseWithError%>'">Deny
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-heading">
<a data-toggle="collapse" data-parent="#accordion"
href="#collapseMe" aria-expanded="true"
aria-controls="collapseMe">
<h4>
<i class="icon-double-angle-up"></i>
</h4>
</a>
</div>
<div id="collapseMe" class="accordion-body collapse in">
<div class="accordion-inner">
<liferay-util:include page="/html/portlet/login/social.jsp" />
</div>
</div>
</div>
<div class="span12 text-center">
<p class="text-info">E-mail addresses already connected with existing accounts allow signing in with them. If a new e-mail address is used, a new account will be automatically created.</p>
</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>
</div>
<!-- END CLIENT NOT AUTHORISED -->
</c:if>

35
src/main/webapp/META-INF/custom_jsps/html/portlet/login/navigation/create_account.jsp Normal file
View File

@ -0,0 +1,35 @@
<%--
/**
* Copyright (c) 2000-2013 Liferay, Inc. All rights reserved.
*
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 2.1 of the License, or (at your option)
* any later version.
*
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
*/
--%>
<%@ include file="/html/portlet/login/init.jsp" %>
<%
String strutsAction = ParamUtil.getString(request, "struts_action");
boolean showCreateAccountIcon = false;
if (!strutsAction.equals("/login/create_account") && company.isStrangers() && !portletName.equals(PortletKeys.FAST_LOGIN)) {
showCreateAccountIcon = true;
}
%>
<c:if test="<%= showCreateAccountIcon %>">
<liferay-ui:icon
iconCssClass="icon-user"
message="create-account"
url="<%= PortalUtil.getCreateAccountURL(request, themeDisplay) %>"
/>
</c:if>

39
src/main/webapp/META-INF/custom_jsps/html/portlet/login/navigation/forgot_password.jsp Normal file
View File

@ -0,0 +1,39 @@
<%--
/**
* Copyright (c) 2000-2013 Liferay, Inc. All rights reserved.
*
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 2.1 of the License, or (at your option)
* any later version.
*
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
*/
--%>
<%@ include file="/html/portlet/login/init.jsp" %>
<%
String strutsAction = ParamUtil.getString(request, "struts_action");
boolean showForgotPasswordIcon = false;
if (!strutsAction.equals("/login/forgot_password") && (company.isSendPassword() || company.isSendPasswordResetLink())) {
showForgotPasswordIcon = true;
}
%>
<c:if test="<%= showForgotPasswordIcon %>">
<portlet:renderURL var="forgotPasswordURL">
<portlet:param name="struts_action" value="/login/forgot_password" />
</portlet:renderURL>
<liferay-ui:icon
iconCssClass="icon-exclamation-sign"
message="forgot-password"
url="<%= forgotPasswordURL %>"
/>
</c:if>

2
src/main/webapp/WEB-INF/liferay-plugin-package.properties
View File

@ -1,6 +1,6 @@
name=login-hook
module-group-id=liferay
module-incremental-version=3
module-incremental-version=4
tags=
short-description=
change-log=