Skip to content

Commit 0b0a72e

Browse files
qqmyersqqmyers
committed
fix logos, add orcid to firstLogin page
1 parent 84f6fc7 commit 0b0a72e

File tree

4 files changed

+28
-43
lines changed

4 files changed

+28
-43
lines changed

‎src/main/java/edu/harvard/iq/dataverse/authorization/AuthenticatedUserDisplayInfo.java‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,13 +106,25 @@ public boolean equals(Object obj) {
106106
}
107107

108108
public void setOrcid(String orcidUrl) {
109-
// TODO Auto-generated method stub
110-
109+
this.orcid=orcidUrl;
111110
}
112111

113112
public String getOrcid() {
114113
return orcid;
115114
}
116115

116+
public String getOrcidForDisplay() {
117+
String orcidUrl = getOrcid();
118+
if(orcidUrl == null) {
119+
return null;
120+
}
121+
int index = orcidUrl.lastIndexOf('/');
122+
if (index > 0) {
123+
return orcidUrl.substring(index + 1);
124+
} else {
125+
return orcidUrl;
126+
}
127+
}
128+
117129
}
118130

‎src/main/webapp/dataverseuser.xhtml‎

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -598,7 +598,8 @@
598598
#{bundle['user.orcid']}
599599
</th>
600600
<td>
601-
<h:graphicImage value="/resources/images/orcid_16x16.png" height="16" width="16" alt="#{of:format1(bundle['alt.logo'], bundle['user.orcid'])}"/>&#160;
601+
<o:importFunctions type="edu.harvard.iq.dataverse.authorization.providers.oauth2.impl.OrcidOAuth2AP" />
602+
<h:graphicImage value="#{OrcidOAuth2AP:getLogo()}" height="16" width="16" alt="#{of:format1(bundle['alt.logo'], bundle['user.orcid'])}"/>&#160;
602603
<h:outputLink value="#{DataverseUserPage.currentUser.authenticatedOrcid}" title="#{bundle['user.orcid.link']}" target="_blank">
603604
<h:outputText value="#{DataverseUserPage.orcidForDisplay}"/>
604605
</h:outputLink>
@@ -815,21 +816,6 @@
815816
</div>
816817
</div>
817818
<!--FIXME: refactor to remove need for EDIT? userAuthProvider is null on CREATE-->
818-
<div class="form-group" jsf:rendered="#{DataverseUserPage.editMode == 'EDIT' and DataverseUserPage.userAuthProvider.displayIdentifier}">
819-
<!-- ORCID iD, for example -->
820-
<h:outputLabel value="#{DataverseUserPage.userAuthProvider.persistentIdName}" for="userPersistentId" class="col-sm-3 control-label">
821-
<span class="glyphicon glyphicon-question-sign tooltip-icon"
822-
data-toggle="tooltip" data-placement="auto right" data-original-title="#{DataverseUserPage.userAuthProvider.persistentIdDescription}"></span>
823-
</h:outputLabel>
824-
<div class="col-sm-4">
825-
<p class="form-control-static">
826-
<h:graphicImage value="#{DataverseUserPage.userAuthProvider.logo}" height="16" width="16" alt="#{of:format1(bundle['alt.logo'], DataverseUserPage.userAuthProvider.persistentIdName)}"/>&#160;
827-
<h:outputLink value="#{DataverseUserPage.userAuthProvider.persistentIdUrlPrefix}#{DataverseUserPage.currentUser.authenticatedUserLookup.persistentUserId}" title="#{DataverseUserPage.userAuthProvider.persistentIdName}" target="_blank">
828-
<h:outputText value="#{DataverseUserPage.userAuthProvider.persistentIdUrlPrefix}#{DataverseUserPage.currentUser.authenticatedUserLookup.persistentUserId}"/>
829-
</h:outputLink>
830-
</p>
831-
</div>
832-
</div>
833819
<div class="form-group" jsf:rendered="#{DataverseUserPage.editMode == 'CREATE' or DataverseUserPage.editMode == 'EDIT'}">
834820
<!-- Affiliation -->
835821
<h:outputLabel value="#{bundle.affiliation}" for="affiliation" class="col-sm-3 control-label">

‎src/main/webapp/loginpage.xhtml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -185,9 +185,10 @@
185185
<div class="form-group text-left">
186186
<div class="col-sm-12">
187187
<h:outputLink styleClass="btn btn-default" value="#{OAuth2Page.linkFor(LoginPage.authProvider.id, LoginPage.redirectPage)}">
188-
<h:graphicImage rendered="#{fn:contains(LoginPage.authProvider.id, 'orcid')}" value="/resources/images/orcid_16x16.png" height="16" width="16" alt="#{of:format1(bundle['alt.logo'], bundle['auth.providers.title.orcid'])}"/>
189-
<h:outputText rendered="#{not fn:contains(LoginPage.authProvider.id, 'orcid')}" value="#{LoginPage.getLoginButtonText()}"/>
190-
<h:outputText rendered="#{fn:contains(LoginPage.authProvider.id, 'orcid')}" value=" #{bundle['login.button.orcid']}"/>
188+
<o:importFunctions type="edu.harvard.iq.dataverse.authorization.providers.oauth2.impl.OrcidOAuth2AP" />
189+
<h:graphicImage rendered="#{fn:contains(LoginPage.authProvider.id, 'orcid')}" value="#{rcidOAuth2AP:getLogo()}" height="16" width="16" alt="#{of:format1(bundle['alt.logo'], bundle['auth.providers.title.orcid'])}"/>
190+
<h:outputText rendered="#{not fn:contains(LoginPage.authProvider.id, 'orcid')}" value="#{LoginPage.getLoginButtonText()}"/>
191+
<h:outputText rendered="#{fn:contains(LoginPage.authProvider.id, 'orcid')}" value=" #{bundle['login.button.orcid']}"/>
191192
</h:outputLink>
192193
<ui:fragment rendered="#{fn:contains(LoginPage.authProvider.id, 'orcid')}">
193194
<p class="help-block small" style="margin-top:1em;">

‎src/main/webapp/oauth2/firstLogin.xhtml‎

Lines changed: 8 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
xmlns:ui="http://java.sun.com/jsf/facelets"
66
xmlns:p="http://primefaces.org/ui"
77
xmlns:jsf="http://xmlns.jcp.org/jsf"
8+
xmlns:o="http://omnifaces.org/ui"
89
xmlns:of="http://omnifaces.org/functions">
910
<h:head>
1011
</h:head>
@@ -95,33 +96,18 @@
9596
<p:message for="selectedEmailMoreThanOneToPickFrom" display="text"/>
9697
</div>
9798
</div>
98-
<div class="form-group" jsf:rendered="#{OAuth2FirstLoginPage.authProvider.displayIdentifier}">
99-
<label for="persistentUserId" class="col-sm-3 control-label">
100-
#{OAuth2FirstLoginPage.authProvider.persistentIdName}
101-
<span class="glyphicon glyphicon-question-sign tooltip-icon"
102-
data-toggle="tooltip" data-placement="auto right" data-original-title="#{OAuth2FirstLoginPage.authProvider.persistentIdDescription}"></span>
103-
</label>
104-
<div class="col-sm-4">
105-
<p class="form-control-static">
106-
<h:graphicImage value="#{OAuth2FirstLoginPage.authProvider.logo}" height="16" width="16" alt="#{of:format1(bundle['alt.logo'], OAuth2FirstLoginPage.authProvider.persistentIdName)}" rendered="#{OAuth2FirstLoginPage.authProvider.logo != null}"/>&#160;
107-
<h:outputLink value="#{OAuth2FirstLoginPage.authProvider.persistentIdUrlPrefix}#{OAuth2FirstLoginPage.newUser.idInService}" title="#{OAuth2FirstLoginPage.authProvider.persistentIdName}" target="_blank" rendered="#{OAuth2FirstLoginPage.authProvider.persistentIdUrlPrefix != null}">
108-
<h:outputText value="#{OAuth2FirstLoginPage.authProvider.persistentIdUrlPrefix}#{OAuth2FirstLoginPage.newUser.idInService}"/>
109-
</h:outputLink>
110-
<h:outputText value="#{OAuth2FirstLoginPage.authProvider.persistentIdUrlPrefix}#{OAuth2FirstLoginPage.newUser.idInService}" rendered="#{OAuth2FirstLoginPage.authProvider.persistentIdUrlPrefix == null}"/>
111-
</p>
112-
</div>
113-
</div>
11499
<div class="form-group" jsf:rendered="#{OAuth2FirstLoginPage.newUser.displayInfo.orcid != null}">
115-
<label for="persistentUserId" class="col-sm-3 control-label">
116-
#{OAuth2FirstLoginPage.authProvider.persistentIdName}
100+
<label for="authenticatedOrcid" class="col-sm-3 control-label">
101+
#{bundle['user.orcid']}
117102
<span class="glyphicon glyphicon-question-sign tooltip-icon"
118103
data-toggle="tooltip" data-placement="auto right" data-original-title="ORCID"></span>
119104
</label>
120-
<div class="col-sm-4">
105+
<div class="col-sm-4" id="authenticatedOrcid">
121106
<p class="form-control-static">
122-
<h:graphicImage value="#{OAuth2FirstLoginPage.authProvider.logo}" height="16" width="16" alt="#{of:format1(bundle['alt.logo'], OAuth2FirstLoginPage.authProvider.persistentIdName)}" rendered="#{OAuth2FirstLoginPage.authProvider.logo != null}"/>&#160;
123-
<h:outputLink value="#{OAuth2FirstLoginPage.authProvider.persistentIdUrlPrefix}#{OAuth2FirstLoginPage.newUser.displayInfo.orcid}" title="#{OAuth2FirstLoginPage.authProvider.persistentIdName}" target="_blank">
124-
<h:outputText value="#{OAuth2FirstLoginPage.authProvider.persistentIdUrlPrefix}#{OAuth2FirstLoginPage.newUser.displayInfo.orcid}"/>
107+
<o:importFunctions type="edu.harvard.iq.dataverse.authorization.providers.oauth2.impl.OrcidOAuth2AP" />
108+
<h:graphicImage value="#{OrcidOAuth2AP:getLogo()}" height="16" width="16" alt="#{of:format1(bundle['alt.logo'], bundle['user.orcid'])}"/>&#160;
109+
<h:outputLink value="#{OAuth2FirstLoginPage.newUser.displayInfo.orcid}" title="#{bundle['user.orcid.link']}" target="_blank">
110+
<h:outputText value="#{OAuth2FirstLoginPage.newUser.displayInfo.orcidForDisplay}"/>
125111
</h:outputLink>
126112
</p>
127113
</div>

0 commit comments

Comments
 (0)