Skip to content

5717 dialog input focus #5903

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

Merged
kcondon merged 12 commits into from
Jun 13, 2019
Merged

5717 dialog input focus #5903

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
89ef31b
Added focus to contact dialog with render logic for userEmail vs mess…
mheppler May 21, 2019
6f9a38b
Added focus component to popups and changed btn-link styles for Cance…
mheppler May 23, 2019
da31a1a
Additionally added focus component to popups and changed btn-link sty…
mheppler May 29, 2019
a91e137
More focus and secondary btn styling changes plus misc clean up [ref …
mheppler Jun 3, 2019
62642ef
Style Guide: primary button is styled differently #5717
pdurbin Jun 5, 2019
2c28994
Another round of accessibility refactoring [ref #5717]
mheppler Jun 7, 2019
9bcb432
Fixed broken onkeypress and onclick javascript on 404 pg to submit se…
mheppler Jun 10, 2019
8658e11
Merge pull request #5917 from IQSS/5717-style-guide
mheppler Jun 10, 2019
a328e4f
Merge branch 'develop' into 5717-dialog-input-focus
mheppler Jun 10, 2019
e43adb6
Fixed btn-default hover state style PrimeFaces and Bootstrap theme ov…
mheppler Jun 10, 2019
fd05813
Fixed dataset pg validation error msg format issue with trailing hyph…
mheppler Jun 10, 2019
5314fbc
Fixed flash refresh issue on login pg, reverted passwordrest pg chang…
mheppler Jun 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions doc/sphinx-guides/source/style/patterns.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,7 @@ For action buttons on a page, we include an icon and text label. Action buttons
Form Buttons
------------

Form buttons typically appear at the bottom of a form, aligned to the left. They do not have icons, just text labels.
Form buttons typically appear at the bottom of a form, aligned to the left. They do not have icons, just text labels. The primary button is styled differently.

.. raw:: html

Expand All @@ -388,7 +388,7 @@ Form buttons typically appear at the bottom of a form, aligned to the left. They
<button id="datasetForm:save" name="datasetForm:save" class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only btn btn-default" onclick="return false;" tabindex="1000" type="submit" role="button" aria-disabled="false">
<span class="ui-button-text ui-c">Save Changes</span>
</button>
<button id="datasetForm:cancel" name="datasetForm:cancel" class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only btn btn-default" onclick="return false;" tabindex="1000" type="submit" role="button" aria-disabled="false">
<button id="datasetForm:cancel" name="datasetForm:cancel" class="btn btn-link" onclick="return false;" tabindex="1000" type="submit" role="button" aria-disabled="false">
<span class="ui-button-text ui-c">Cancel</span>
</button>
</div>
Expand All @@ -399,7 +399,7 @@ Form buttons typically appear at the bottom of a form, aligned to the left. They

<div class="button-block">
<p:commandButton id="save" styleClass="btn btn-default" value="#{bundle.saveChanges}" action="#{page.save}" update="@form,:messagePanel" />
<p:commandButton id="cancel" styleClass="btn btn-default" value="#{bundle.cancel}" action="#{page.cancel}" process="@this" update="@form">
<p:commandButton id="cancel" styleClass="btn btn-link" value="#{bundle.cancel}" action="#{page.cancel}" process="@this" update="@form">
<p:resetInput target="@form" />
</p:commandButton>
</div>
Expand Down
16 changes: 9 additions & 7 deletions src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1931,7 +1931,8 @@ private String init(boolean initFull) {
}

if (settingsWrapper.isTrueForKey(SettingsServiceBean.Key.PublicInstall, false)){
JH.addMessage(FacesMessage.SEVERITY_WARN, BundleUtil.getStringFromBundle("dataset.message.publicInstall"));
JH.addMessage(FacesMessage.SEVERITY_WARN, BundleUtil.getStringFromBundle("dataset.message.label.fileAccess"),
BundleUtil.getStringFromBundle("dataset.message.publicInstall"));
}

resetVersionUI();
Expand All @@ -1943,15 +1944,17 @@ private String init(boolean initFull) {
try {
privateUrl = commandEngine.submit(new GetPrivateUrlCommand(dvRequestService.getDataverseRequest(), dataset));
if (privateUrl != null) {
JH.addMessage(FacesMessage.SEVERITY_INFO, BundleUtil.getStringFromBundle("dataset.privateurl.infoMessageAuthor", Arrays.asList(getPrivateUrlLink(privateUrl))));
JH.addMessage(FacesMessage.SEVERITY_INFO, BundleUtil.getStringFromBundle("dataset.privateurl.header"),
BundleUtil.getStringFromBundle("dataset.privateurl.infoMessageAuthor", Arrays.asList(getPrivateUrlLink(privateUrl))));
}
} catch (CommandException ex) {
// No big deal. The user simply doesn't have access to create or delete a Private URL.
}
if (session.getUser() instanceof PrivateUrlUser) {
PrivateUrlUser privateUrlUser = (PrivateUrlUser) session.getUser();
if (dataset != null && dataset.getId().equals(privateUrlUser.getDatasetId())) {
JH.addMessage(FacesMessage.SEVERITY_INFO, BundleUtil.getStringFromBundle("dataset.privateurl.infoMessageReviewer"));
JH.addMessage(FacesMessage.SEVERITY_WARN, BundleUtil.getStringFromBundle("dataset.privateurl.header"),
BundleUtil.getStringFromBundle("dataset.privateurl.infoMessageReviewer"));
}
}

Expand Down Expand Up @@ -3259,9 +3262,7 @@ public String save() {
// Validate
Set<ConstraintViolation> constraintViolations = workingVersion.validate();
if (!constraintViolations.isEmpty()) {
//JsfHelper.addFlashMessage(BundleUtil.getStringFromBundle("dataset.message.validationError"));
JH.addMessage(FacesMessage.SEVERITY_ERROR, BundleUtil.getStringFromBundle("dataset.message.validationError"));
//FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(FacesMessage.SEVERITY_ERROR, "Validation Error", "See below for details."));
FacesContext.getCurrentInstance().validationFailed();
return "";
}

Expand Down Expand Up @@ -4824,7 +4825,8 @@ public void createPrivateUrl() {
try {
PrivateUrl createdPrivateUrl = commandEngine.submit(new CreatePrivateUrlCommand(dvRequestService.getDataverseRequest(), dataset));
privateUrl = createdPrivateUrl;
JH.addMessage(FacesMessage.SEVERITY_INFO, BundleUtil.getStringFromBundle("dataset.privateurl.infoMessageAuthor", Arrays.asList(getPrivateUrlLink(privateUrl))));
JH.addMessage(FacesMessage.SEVERITY_INFO, BundleUtil.getStringFromBundle("dataset.privateurl.header"),
BundleUtil.getStringFromBundle("dataset.privateurl.infoMessageAuthor", Arrays.asList(getPrivateUrlLink(privateUrl))));
privateUrlWasJustCreated = true;
} catch (CommandException ex) {
String msg = BundleUtil.getStringFromBundle("dataset.privateurl.noPermToCreate", PrivateUrlUtil.getRequiredPermissions(ex));
Expand Down
4 changes: 3 additions & 1 deletion src/main/java/edu/harvard/iq/dataverse/passwordreset/PasswordResetPage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import javax.inject.Named;

import edu.harvard.iq.dataverse.validation.PasswordValidatorServiceBean;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import javax.faces.component.UIComponent;
Expand Down Expand Up @@ -127,7 +128,8 @@ public String sendPasswordResetLink() {
*/
logger.log(Level.INFO, "Couldn''t find single account using {0}", emailAddress);
}
FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(FacesMessage.SEVERITY_INFO, BundleUtil.getStringFromBundle("passwdVal.passwdReset.resetInitiated"), ""));
FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(FacesMessage.SEVERITY_INFO, BundleUtil.getStringFromBundle("passwdVal.passwdReset.resetInitiated"),
BundleUtil.getStringFromBundle("passwdReset.successSubmit.tip", Arrays.asList(emailAddress))));
} catch (PasswordResetException ex) {
/**
* @todo do we really need a special exception for this??
Expand Down
Loading