Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

7771 accessibility update form labels #8042

Merged
merged 9 commits into from
Aug 6, 2021
Merged

7771 accessibility update form labels #8042

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4a2f967
#7771 update label
sekmiller Aug 2, 2021
a9c25eb
#7771 fully qualify the labels to correspond with PF
sekmiller Aug 2, 2021
3a08947
Merge branch 'develop' into 7771-accessibility-update-form-labels
sekmiller Aug 2, 2021
73a82b4
#7771 remove unnecessary label
sekmiller Aug 2, 2021
3567ccb
Merge branch 'develop' into 7771-accessibility-update-form-labels
sekmiller Aug 3, 2021
bb6038e
Merge branch 'develop' into 7771-accessibility-update-form-labels
sekmiller Aug 5, 2021
2eda146
#7771 use pf output label
sekmiller Aug 6, 2021
f1af695
#7771 missed a div update
sekmiller Aug 6, 2021
be3a5f5
#7771 change to h:outputLabel
sekmiller Aug 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
78 changes: 37 additions & 41 deletions src/main/webapp/dataverseuser.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -570,21 +570,25 @@
</ui:fragment>
<div class="form-horizontal">
<div class="form-group" jsf:rendered="#{DataverseUserPage.editMode == 'CREATE' or DataverseUserPage.editMode == 'EDIT'}">
<!-- Username -->
<label for="userNameEmail" class="col-sm-3 control-label">
#{bundle['user.username']} <span class="glyphicon glyphicon-asterisk text-danger"/>
<!-- Username -->
<h:outputLabel value="#{bundle['user.username']}" for="userName" class="col-sm-3 control-label">
<span class="glyphicon glyphicon-asterisk text-danger"/>
<span class="glyphicon glyphicon-question-sign tooltip-icon"
data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['user.username.illegal.tip']}"></span>
</label>
</h:outputLabel>

<div class="col-sm-9">
<p class="help-block">#{bundle['user.username.valid']}</p>
<div class="help-block">
<h:outputText value="#{bundle['user.username.valid']}" escape="false">
</h:outputText>
</div>
</div>
<div class="col-sm-4 col-sm-offset-3">
<p:inputText id="userName" styleClass="form-control"
validator="#{DataverseUserPage.validateUserName}"
value="#{DataverseUserPage.username}"
disabled="#{DataverseUserPage.editMode != 'CREATE'}"
binding="#{DataverseUserPage.usernameField}"/>
validator="#{DataverseUserPage.validateUserName}"
value="#{DataverseUserPage.username}"
disabled="#{DataverseUserPage.editMode != 'CREATE'}"
binding="#{DataverseUserPage.usernameField}"/>
<p:message for="userName" display="text" />
</div>
</div>
Expand All @@ -602,12 +606,11 @@
</div>
<div class="form-group" jsf:rendered="#{DataverseUserPage.editMode == 'CREATE' or DataverseUserPage.editMode == DataverseUserPage.changePasswordMode}">
<!-- Password -->
<label for="inputPassword" class="col-sm-3 control-label">
<h:outputText value="#{DataverseUserPage.editMode == 'CREATE' ? bundle['user.password'] : bundle['user.newPassword']}" />
<span class="glyphicon glyphicon-asterisk text-danger"></span>
<span class="glyphicon glyphicon-question-sign tooltip-icon"
data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['user.passwd.illegal.tip']}"></span>
</label>
<h:outputLabel value="#{DataverseUserPage.editMode == 'CREATE' ? bundle['user.password'] : bundle['user.newPassword']}" for="inputPassword" class="col-sm-3 control-label" >
<span class="glyphicon glyphicon-asterisk text-danger"></span>
<span class="glyphicon glyphicon-question-sign tooltip-icon"
data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['user.passwd.illegal.tip']}"></span>
</h:outputLabel>
<div class="col-sm-9">
<div class="help-block">
<h:outputFormat value="#{bundle['user.updatePassword.password']}" escape="false">
Expand All @@ -622,47 +625,43 @@
</div>
<div class="form-group" jsf:rendered="#{DataverseUserPage.editMode == 'CREATE' or DataverseUserPage.editMode == DataverseUserPage.changePasswordMode}">
<!-- Retype Password -->
<label for="retypePassword" class="col-sm-3 control-label">
#{bundle['user.rePasswd']} <span class="glyphicon glyphicon-asterisk text-danger"/>
<h:outputLabel value="#{bundle['user.rePasswd']}" for="retypePassword" class="col-sm-3 control-label"> <span class="glyphicon glyphicon-asterisk text-danger"/>
<span class="glyphicon glyphicon-question-sign tooltip-icon"
data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['user.rePasswd.tip']}"></span>
</label>
</h:outputLabel>
<div class="col-sm-4">
<p:password id="retypePassword" label="#{bundle['user.rePasswd']}" styleClass="form-control" value="#{DataverseUserPage.inputPassword}" autocomplete="off"/><!-- browsers will in general not respect autocomplete="foo", but scanners will still flag it as a potential problem -->
<p:message for="retypePassword" display="text" />
</div>
</div>
<div class="form-group" jsf:rendered="#{DataverseUserPage.editMode == 'CREATE' or DataverseUserPage.editMode == 'EDIT'}">
<!-- First Name -->
<label for="firstName" class="col-sm-3 control-label">
#{bundle['user.firstName']} <span class="glyphicon glyphicon-asterisk text-danger"/>
<span class="glyphicon glyphicon-question-sign tooltip-icon"
data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['user.firstName.tip']}"></span>
</label>
<!-- First Name -->
<h:outputLabel value="#{bundle['user.firstName']}" for="firstName" class="col-sm-3 control-label" > <span class="glyphicon glyphicon-asterisk text-danger"/>
<span class="glyphicon glyphicon-question-sign tooltip-icon"
data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['user.firstName.tip']}"></span>
</h:outputLabel>
<div class="col-sm-4">
<p:inputText id="firstName" styleClass="form-control" value="#{DataverseUserPage.userDisplayInfo.firstName}" />
<p:message for="firstName" display="text" />
</div>
</div>
<div class="form-group" jsf:rendered="#{DataverseUserPage.editMode == 'CREATE' or DataverseUserPage.editMode == 'EDIT'}">
<!-- Last Name -->
<label for="lastName" class="col-sm-3 control-label">
#{bundle['user.lastName']} <span class="glyphicon glyphicon-asterisk text-danger"/>
<h:outputLabel value="#{bundle['user.lastName']}" for="lastName" class="col-sm-3 control-label" > <span class="glyphicon glyphicon-asterisk text-danger"/>
<span class="glyphicon glyphicon-question-sign tooltip-icon"
data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['user.lastName.tip']}"></span>
</label>
</h:outputLabel>
<div class="col-sm-4">
<p:inputText id="lastName" styleClass="form-control" value="#{DataverseUserPage.userDisplayInfo.lastName}" />
<p:message for="lastName" display="text" />
</div>
</div>
<div class="form-group" jsf:rendered="#{DataverseUserPage.editMode == 'CREATE' or DataverseUserPage.editMode == 'EDIT'}">
<!-- Email -->
<label for="email" class="col-sm-3 control-label">
#{bundle.email} <span class="glyphicon glyphicon-asterisk text-danger"/>
<h:outputLabel value="#{bundle['email']}" for="email" class="col-sm-3 control-label"> <span class="glyphicon glyphicon-asterisk text-danger"/>
<span class="glyphicon glyphicon-question-sign tooltip-icon"
data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['user.email.tip']}"></span>
</label>
</h:outputLabel>
<div class="col-sm-4">
<p:inputText id="email" styleClass="form-control"
validator="#{DataverseUserPage.validateUserEmail}"
Expand All @@ -673,11 +672,10 @@
<!--FIXME: refactor to remove need for EDIT? userAuthProvider is null on CREATE-->
<div class="form-group" jsf:rendered="#{DataverseUserPage.editMode == 'EDIT' and DataverseUserPage.userAuthProvider.displayIdentifier}">
<!-- ORCID iD, for example -->
<label for="userPersistentId" class="col-sm-3 control-label">
#{DataverseUserPage.userAuthProvider.persistentIdName}
<h:outputLabel value="#{DataverseUserPage.userAuthProvider.persistentIdName}" for="userPersistentId" class="col-sm-3 control-label">
<span class="glyphicon glyphicon-question-sign tooltip-icon"
data-toggle="tooltip" data-placement="auto right" data-original-title="#{DataverseUserPage.userAuthProvider.persistentIdDescription}"></span>
</label>
</h:outputLabel>
<div class="col-sm-4">
<p class="form-control-static">
<h:graphicImage value="#{DataverseUserPage.userAuthProvider.logo}" height="16" width="16" alt="#{of:format1(bundle['alt.logo'], DataverseUserPage.userAuthProvider.persistentIdName)}"/>&#160;
Expand All @@ -689,23 +687,21 @@
</div>
<div class="form-group" jsf:rendered="#{DataverseUserPage.editMode == 'CREATE' or DataverseUserPage.editMode == 'EDIT'}">
<!-- Affiliation -->
<label for="affiliation" class="col-sm-3 control-label">
#{bundle.affiliation}
<h:outputLabel value="#{bundle.affiliation}" for="affiliation" class="col-sm-3 control-label">
<span class="glyphicon glyphicon-question-sign tooltip-icon"
data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['user.affiliation.tip']}"></span>
</label>
</h:outputLabel>
<div class="col-sm-4">
<p:inputText id="affiliation" styleClass="form-control" value="#{DataverseUserPage.userDisplayInfo.affiliation}" />
<p:message for="affiliation" display="text" />
</div>
</div>
<div class="form-group" jsf:rendered="#{DataverseUserPage.editMode == 'CREATE' or DataverseUserPage.editMode == 'EDIT'}">
<!-- Position -->
<label for="position" class="col-sm-3 control-label">
#{bundle['user.position']}
<span class="glyphicon glyphicon-question-sign tooltip-icon"
data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['user.position.tip']}"></span>
</label>
<h:outputLabel value="#{bundle.position}" for="position" class="col-sm-3 control-label">
<span class="glyphicon glyphicon-question-sign tooltip-icon"
data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['user.position.tip']}"></span>
</h:outputLabel>
<div class="col-sm-4">
<p:inputText id="position" styleClass="form-control" value="#{DataverseUserPage.userDisplayInfo.position}" />
<p:message for="position" display="text" />
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/termsofuse.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
xmlns:p="http://primefaces.org/ui">

<div class="form-group">
<label for="position" class="col-sm-3 control-label">
<label class="col-sm-3 control-label">
#{bundle['user.acccountterms']} <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}"/>
<span class="glyphicon glyphicon-question-sign tooltip-icon"
data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['user.acccountterms.tip']}"></span>
Expand Down